Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6] / net / irda / parameters.c

diff --git a/net/irda/parameters.c b/net/irda/parameters.c
index 2627dad7cd87b8c15ef79ff3a85a8154d1f03fdf..7183e9ef79963910b3b9a46ee1483fe767f98822 100644 (file)
--- a/net/irda/parameters.c
+++ b/net/irda/parameters.c
@@ -463,7 +463,7 @@ int irda_param_insert(void *self, __u8 pi, __u8 *buf, int len,
        int n = 0;
 
        IRDA_ASSERT(buf != NULL, return ret;);
-       IRDA_ASSERT(info != 0, return ret;);
+       IRDA_ASSERT(info != NULL, return ret;);
 
        pi_minor = pi & info->pi_mask;
        pi_major = pi >> info->pi_major_offset;
@@ -517,7 +517,7 @@ static int irda_param_extract(void *self, __u8 *buf, int len,
        int n = 0;
 
        IRDA_ASSERT(buf != NULL, return ret;);
-       IRDA_ASSERT(info != 0, return ret;);
+       IRDA_ASSERT(info != NULL, return ret;);
 
        pi_minor = buf[n] & info->pi_mask;
        pi_major = buf[n] >> info->pi_major_offset;
@@ -570,7 +570,7 @@ int irda_param_extract_all(void *self, __u8 *buf, int len,
        int n = 0;
 
        IRDA_ASSERT(buf != NULL, return ret;);
-       IRDA_ASSERT(info != 0, return ret;);
+       IRDA_ASSERT(info != NULL, return ret;);
 
        /*
         * Parse all parameters. Each parameter must be at least two bytes