* [2.6 patch] drivers/net/tulip/dmfe.c: fix check after use
@ 2005-03-25 1:03 Adrian Bunk
2005-03-25 2:58 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Bunk @ 2005-03-25 1:03 UTC (permalink / raw)
To: jgarzik; +Cc: tulip-users, jgarzik, linux-net, linux-kernel
This patch fixes a check after use found by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c.old 2005-03-23 05:05:36.000000000 +0100
+++ linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c 2005-03-23 05:06:00.000000000 +0100
@@ -736,20 +736,22 @@
static irqreturn_t dmfe_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
struct DEVICE *dev = dev_id;
struct dmfe_board_info *db = netdev_priv(dev);
- unsigned long ioaddr = dev->base_addr;
+ unsigned long ioaddr;
unsigned long flags;
DMFE_DBUG(0, "dmfe_interrupt()", 0);
if (!dev) {
DMFE_DBUG(1, "dmfe_interrupt() without DEVICE arg", 0);
return IRQ_NONE;
}
+ ioaddr = dev->base_addr;
+
spin_lock_irqsave(&db->lock, flags);
/* Got DM910X status */
db->cr5_data = inl(ioaddr + DCR5);
outl(db->cr5_data, ioaddr + DCR5);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [2.6 patch] drivers/net/tulip/dmfe.c: fix check after use
2005-03-25 1:03 [2.6 patch] drivers/net/tulip/dmfe.c: fix check after use Adrian Bunk
@ 2005-03-25 2:58 ` Jeff Garzik
2005-03-26 19:04 ` [2.6 patch] drivers/net/tulip/dmfe.c: remove a " Adrian Bunk
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2005-03-25 2:58 UTC (permalink / raw)
To: Adrian Bunk; +Cc: tulip-users, linux-net, linux-kernel
Adrian Bunk wrote:
> This patch fixes a check after use found by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> --- linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c.old 2005-03-23 05:05:36.000000000 +0100
> +++ linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c 2005-03-23 05:06:00.000000000 +0100
> @@ -736,20 +736,22 @@
>
> static irqreturn_t dmfe_interrupt(int irq, void *dev_id, struct pt_regs *regs)
> {
> struct DEVICE *dev = dev_id;
> struct dmfe_board_info *db = netdev_priv(dev);
> - unsigned long ioaddr = dev->base_addr;
> + unsigned long ioaddr;
> unsigned long flags;
>
> DMFE_DBUG(0, "dmfe_interrupt()", 0);
>
> if (!dev) {
> DMFE_DBUG(1, "dmfe_interrupt() without DEVICE arg", 0);
> return IRQ_NONE;
> }
I would prefer to remove the "if (!dev)" test, since it shouldn't ever
succeed.
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread
* [2.6 patch] drivers/net/tulip/dmfe.c: remove a check after use
2005-03-25 2:58 ` Jeff Garzik
@ 2005-03-26 19:04 ` Adrian Bunk
0 siblings, 0 replies; 3+ messages in thread
From: Adrian Bunk @ 2005-03-26 19:04 UTC (permalink / raw)
To: Jeff Garzik; +Cc: tulip-users, linux-net, linux-kernel
On Thu, Mar 24, 2005 at 09:58:27PM -0500, Jeff Garzik wrote:
> Adrian Bunk wrote:
> >This patch fixes a check after use found by the Coverity checker.
> >
> >Signed-off-by: Adrian Bunk <bunk@stusta.de>
> >
> >--- linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c.old 2005-03-23
> >05:05:36.000000000 +0100
> >+++ linux-2.6.12-rc1-mm1-full/drivers/net/tulip/dmfe.c 2005-03-23
> >05:06:00.000000000 +0100
> >@@ -736,20 +736,22 @@
> >
> > static irqreturn_t dmfe_interrupt(int irq, void *dev_id, struct pt_regs
> > *regs)
> > {
> > struct DEVICE *dev = dev_id;
> > struct dmfe_board_info *db = netdev_priv(dev);
> >- unsigned long ioaddr = dev->base_addr;
> >+ unsigned long ioaddr;
> > unsigned long flags;
> >
> > DMFE_DBUG(0, "dmfe_interrupt()", 0);
> >
> > if (!dev) {
> > DMFE_DBUG(1, "dmfe_interrupt() without DEVICE arg", 0);
> > return IRQ_NONE;
> > }
>
> I would prefer to remove the "if (!dev)" test, since it shouldn't ever
> succeed.
Patch below.
> Jeff
cu
Adrian
<-- snip -->
This patch removes a NULL check that was useles because it happened
after the first dereference of the variable.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.12-rc1-mm3-full/drivers/net/tulip/dmfe.c.old 2005-03-26 19:06:46.000000000 +0100
+++ linux-2.6.12-rc1-mm3-full/drivers/net/tulip/dmfe.c 2005-03-26 19:07:03.000000000 +0100
@@ -744,11 +744,6 @@
DMFE_DBUG(0, "dmfe_interrupt()", 0);
- if (!dev) {
- DMFE_DBUG(1, "dmfe_interrupt() without DEVICE arg", 0);
- return IRQ_NONE;
- }
-
spin_lock_irqsave(&db->lock, flags);
/* Got DM910X status */
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-03-26 19:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-25 1:03 [2.6 patch] drivers/net/tulip/dmfe.c: fix check after use Adrian Bunk
2005-03-25 2:58 ` Jeff Garzik
2005-03-26 19:04 ` [2.6 patch] drivers/net/tulip/dmfe.c: remove a " Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox