aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring/smctr.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-01-24 05:06:46 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:07:12 -0500
commit79ea13ce07c951bb4d95471e7300baa0f1be9e78 (patch)
treec0ea320464201854c5d3a222e2dd0d10ae22c95f /drivers/net/tokenring/smctr.c
parent3e18826c73735eee5fca92584137824d9a387008 (diff)
NULL noise in drivers/net
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
-rw-r--r--drivers/net/tokenring/smctr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 93da3a36cde8..8909050b8ea7 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -2310,7 +2310,7 @@ static irqreturn_t smctr_interrupt(int irq, void *dev_id)
2310 && (tp->acb_head->subcmd 2310 && (tp->acb_head->subcmd
2311 == RW_TRC_STATUS_BLOCK)) 2311 == RW_TRC_STATUS_BLOCK))
2312 { 2312 {
2313 if(tp->ptr_bcn_type != 0) 2313 if(tp->ptr_bcn_type)
2314 { 2314 {
2315 *(tp->ptr_bcn_type) 2315 *(tp->ptr_bcn_type)
2316 = (__u32)((SBlock *)tp->misc_command_data)->BCN_Type; 2316 = (__u32)((SBlock *)tp->misc_command_data)->BCN_Type;
@@ -2980,7 +2980,7 @@ static int smctr_load_firmware(struct net_device *dev)
2980 return (UCODE_PRESENT); 2980 return (UCODE_PRESENT);
2981 2981
2982 /* Verify the firmware exists and is there in the right amount. */ 2982 /* Verify the firmware exists and is there in the right amount. */
2983 if((tp->ptr_ucode == 0L) 2983 if (!tp->ptr_ucode
2984 || (*(tp->ptr_ucode + UCODE_VERSION_OFFSET) < UCODE_VERSION)) 2984 || (*(tp->ptr_ucode + UCODE_VERSION_OFFSET) < UCODE_VERSION))
2985 { 2985 {
2986 return (UCODE_NOT_PRESENT); 2986 return (UCODE_NOT_PRESENT);