]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[NETPOLL]: wrong return for null netpoll_poll_lock()
authorBen Dooks <ben-linux@fluff.org>
Wed, 12 Oct 2005 22:12:21 +0000 (15:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Oct 2005 22:12:21 +0000 (15:12 -0700)
When netpoll is not being used, the macro that
defines the removed routing netpoll_poll_lock
defines the return as zero, but the real
routine returns a `void *`

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netpoll.h

index 5ade54a78dbbb3a3618d10d5e3d21d5d67a5b2fe..ca5a8733000fa08b65c21b3456b052b9f48dde21 100644 (file)
@@ -86,7 +86,7 @@ static inline void netpoll_poll_unlock(void *have)
 
 #else
 #define netpoll_rx(a) 0
-#define netpoll_poll_lock(a) 0
+#define netpoll_poll_lock(a) NULL
 #define netpoll_poll_unlock(a)
 #endif