aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/tokenring/smctr.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-01-24 02:06:46 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:07:12 -0800
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 93da3a36cde..8909050b8ea 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)
&& (tp->acb_head->subcmd
== RW_TRC_STATUS_BLOCK))
{
- if(tp->ptr_bcn_type != 0)
+ if(tp->ptr_bcn_type)
{
*(tp->ptr_bcn_type)
= (__u32)((SBlock *)tp->misc_command_data)->BCN_Type;
@@ -2980,7 +2980,7 @@ static int smctr_load_firmware(struct net_device *dev)
return (UCODE_PRESENT);
/* Verify the firmware exists and is there in the right amount. */
- if((tp->ptr_ucode == 0L)
+ if (!tp->ptr_ucode
|| (*(tp->ptr_ucode + UCODE_VERSION_OFFSET) < UCODE_VERSION))
{
return (UCODE_NOT_PRESENT);