diff options
author | Richard Knutsson <ricknu-0@student.ltu.se> | 2007-12-16 17:10:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-12-16 17:10:33 -0500 |
commit | a26e01d71622a4cecad06ce85bcab3ed878e7f83 (patch) | |
tree | 3f5542ffbfa3daad4bd4715a6c45a9ea2257ff08 /net | |
parent | ea332912b8a2e0b2f51ac3b6c197b71d3a18cbb7 (diff) |
[IRDA]: irda parameters warning fixes.
This patch fixes:
CHECK /home/kernel/src/net/irda/parameters.c
/home/kernel/src/net/irda/parameters.c:466:2: warning: Using plain integer as NULL pointer
/home/kernel/src/net/irda/parameters.c:520:2: warning: Using plain integer as NULL pointer
/home/kernel/src/net/irda/parameters.c:573:2: warning: Using plain integer as NULL pointer
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/irda/parameters.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/irda/parameters.c b/net/irda/parameters.c index 2627dad7cd87..7183e9ef7996 100644 --- 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, | |||
463 | int n = 0; | 463 | int n = 0; |
464 | 464 | ||
465 | IRDA_ASSERT(buf != NULL, return ret;); | 465 | IRDA_ASSERT(buf != NULL, return ret;); |
466 | IRDA_ASSERT(info != 0, return ret;); | 466 | IRDA_ASSERT(info != NULL, return ret;); |
467 | 467 | ||
468 | pi_minor = pi & info->pi_mask; | 468 | pi_minor = pi & info->pi_mask; |
469 | pi_major = pi >> info->pi_major_offset; | 469 | pi_major = pi >> info->pi_major_offset; |
@@ -517,7 +517,7 @@ static int irda_param_extract(void *self, __u8 *buf, int len, | |||
517 | int n = 0; | 517 | int n = 0; |
518 | 518 | ||
519 | IRDA_ASSERT(buf != NULL, return ret;); | 519 | IRDA_ASSERT(buf != NULL, return ret;); |
520 | IRDA_ASSERT(info != 0, return ret;); | 520 | IRDA_ASSERT(info != NULL, return ret;); |
521 | 521 | ||
522 | pi_minor = buf[n] & info->pi_mask; | 522 | pi_minor = buf[n] & info->pi_mask; |
523 | pi_major = buf[n] >> info->pi_major_offset; | 523 | pi_major = buf[n] >> info->pi_major_offset; |
@@ -570,7 +570,7 @@ int irda_param_extract_all(void *self, __u8 *buf, int len, | |||
570 | int n = 0; | 570 | int n = 0; |
571 | 571 | ||
572 | IRDA_ASSERT(buf != NULL, return ret;); | 572 | IRDA_ASSERT(buf != NULL, return ret;); |
573 | IRDA_ASSERT(info != 0, return ret;); | 573 | IRDA_ASSERT(info != NULL, return ret;); |
574 | 574 | ||
575 | /* | 575 | /* |
576 | * Parse all parameters. Each parameter must be at least two bytes | 576 | * Parse all parameters. Each parameter must be at least two bytes |