leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] lirc_bt829: Fix iomap and PCI device leaks

Browse Source 
We must call iounmap() and pci_dev_put() when removed and on
the probe failure path.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Ben Hutchings 2013-09-04 22:31:59 -03:00 committed by Mauro Carvalho Chehab
parent d06d3ea783
commit fd39abee9e
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/media/lirc/lirc_bt829.c
View File

@ -82,6 +82,7 @@ static struct pci_dev *do_pci_probe(void)
} }
if (pci_addr_phys == 0) { if (pci_addr_phys == 0) {
pr_err("no memory resource ?\n"); pr_err("no memory resource ?\n");
pci_dev_put(my_dev);
return NULL; return NULL;
} }
} else { } else {
@ -119,13 +120,16 @@ static void atir_set_use_dec(void *data)
int init_module(void) int init_module(void)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
int rc;
pdev = do_pci_probe(); pdev = do_pci_probe();
if (pdev == NULL) if (pdev == NULL)
return -ENODEV; return -ENODEV;
if (!atir_init_start()) if (!atir_init_start()) {
return -ENODEV; rc = -ENODEV;
goto err_put_dev;
}
strcpy(atir_driver.name, "ATIR"); strcpy(atir_driver.name, "ATIR");
atir_driver.minor = -1; atir_driver.minor = -1;
@ -141,17 +145,28 @@ int init_module(void)
atir_minor = lirc_register_driver(&atir_driver); atir_minor = lirc_register_driver(&atir_driver);
if (atir_minor < 0) { if (atir_minor < 0) {
pr_err("failed to register driver!\n"); pr_err("failed to register driver!\n");
return atir_minor; rc = atir_minor;
goto err_unmap;
} }
dprintk("driver is registered on minor %d\n", atir_minor); dprintk("driver is registered on minor %d\n", atir_minor);
return 0; return 0;
err_unmap:
iounmap(pci_addr_lin);
err_put_dev:
pci_dev_put(pdev);
return rc;
} }
void cleanup_module(void) void cleanup_module(void)
{ {
struct pci_dev *pdev = to_pci_dev(atir_driver.dev);
lirc_unregister_driver(atir_minor); lirc_unregister_driver(atir_minor);
iounmap(pci_addr_lin);
pci_dev_put(pdev);
} }