* [janitor] dgrs: add missing iounmaps
@ 2004-04-05 23:27 Randy.Dunlap
2004-04-06 12:16 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Randy.Dunlap @ 2004-04-05 23:27 UTC (permalink / raw)
To: netdev; +Cc: jgarzik
[resend]
Insert missing iounmap's.
From: Leana Ogasawara <ogasawara@osdl.org>
---
linux-265-kj1-rddunlap/drivers/net/dgrs.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/net/dgrs.c~dgrs_iounmap drivers/net/dgrs.c
--- linux-265-kj1/drivers/net/dgrs.c~dgrs_iounmap 2004-04-05 13:08:11.000000000 -0700
+++ linux-265-kj1-rddunlap/drivers/net/dgrs.c 2004-04-05 13:08:11.000000000 -0700
@@ -327,8 +327,10 @@ check_board_dma(struct net_device *dev0)
*/
priv0->vplxdma[PLX_DMA0_MODE/4] = 0xFFFFFFFF;
x = priv0->vplxdma[PLX_DMA0_MODE/4];
- if (x != 0x00001FFF)
+ if (x != 0x00001FFF) {
+ iounmap((void *)priv0->vplxdma);
return (0);
+ }
return (1);
}
@@ -1020,6 +1022,8 @@ dgrs_download(struct net_device *dev0)
if (!is)
{
printk("%s: Illegal IRQ %d\n", dev0->name, dev0->irq);
+ iounmap(priv0->vmem);
+ priv0->vmem = NULL;
return -ENXIO;
}
OUTB(dev0->base_addr + ES4H_AS_31_24,
@@ -1101,6 +1105,8 @@ dgrs_download(struct net_device *dev0)
if (priv0->bcomm->bc_status < BC_RUN)
{
printk("%s: board not operating\n", dev0->name);
+ iounmap(priv0->vmem);
+ priv0->vmem = NULL;
return -ENXIO;
}
_
--
~Randy
"We have met the enemy and he is us." -- Pogo (by Walt Kelly)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [janitor] dgrs: add missing iounmaps
2004-04-05 23:27 [janitor] dgrs: add missing iounmaps Randy.Dunlap
@ 2004-04-06 12:16 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2004-04-06 12:16 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: netdev
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-04-06 12:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-04-05 23:27 [janitor] dgrs: add missing iounmaps Randy.Dunlap
2004-04-06 12:16 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).