aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <[email protected]>2011-10-06 14:29:48 -0700
committerGreg Kroah-Hartman <[email protected]>2011-10-18 14:17:40 -0700
commit9fdbdd062bfc187e2aa32f7880fa7e8ae717efdf (patch)
tree473ad879cfb805c26f6f09a7ea5d02c49e15d411
parent8193c4290620d9b2a6ac116719f11aa99053a90d (diff)
parport_pc: release IO region properly if unsupported ITE887x card is found
sio_ite_8872_probe() bails out if it detects no-parallel (1S, 2S) or unknown card. It doesn't call release_region() on the previously allocated resource though. This causes (a) leak of the resource (b) kernel oops when parport module is removed and /proc/ioports is read. This is because the string that has been associated to the IO port region is a static char array inside the already removed module. Let's call release_region() properly before baling out. Signed-off-by: Jiri Kosina <[email protected]> Acked-by: Niels de Vos <[email protected]> Cc: Bjorn Helgaas <[email protected]> Cc: Alan Cox <[email protected]> Cc: Joe Krahn <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/parport/parport_pc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index d1cdb9449f84..d0b597b50398 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2595,14 +2595,17 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
break;
case 0x6:
printk(KERN_INFO "parport_pc: ITE8873 found (1S)\n");
+ release_region(inta_addr[i], 32);
return 0;
case 0x8:
printk(KERN_INFO "parport_pc: ITE8874 found (2S)\n");
+ release_region(inta_addr[i], 32);
return 0;
default:
printk(KERN_INFO "parport_pc: unknown ITE887x\n");
printk(KERN_INFO "parport_pc: please mail 'lspci -nvv' "
"output to [email protected]\n");
+ release_region(inta_addr[i], 32);
return 0;
}