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

[media] lirc_bt829: Enable and disable device

Browse Source 
We must not assume that the PCI device is already enabled.

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:32:19 -03:00 committed by Mauro Carvalho Chehab
parent fd39abee9e
commit cfe1b7a703
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,9 +126,13 @@ int init_module(void)
if (pdev == NULL)
return -ENODEV;
rc = pci_enable_device(pdev);
if (rc)
goto err_put_dev;
if (!atir_init_start()) {
rc = -ENODEV;
goto err_put_dev;
goto err_disable;
}
strcpy(atir_driver.name, "ATIR");
@ -154,6 +158,8 @@ int init_module(void)
err_unmap:
iounmap(pci_addr_lin);
err_disable:
pci_disable_device(pdev);
err_put_dev:
pci_dev_put(pdev);
return rc;
@ -166,6 +172,7 @@ void cleanup_module(void)
lirc_unregister_driver(atir_minor);
iounmap(pci_addr_lin);
pci_disable_device(pdev);
pci_dev_put(pdev);
}