* [PATCH 09/18 v2] isdn: mISDN: call disable_pci_device() if pci_probe() failed
@ 2010-08-09 19:50 Kulikov Vasiliy
2010-08-10 8:43 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-08-09 19:50 UTC (permalink / raw)
To: kernel-janitors
Cc: Karsten Keil, David S. Miller, Andrew Morton,
Uwe Kleine-König, Peter Huewe, Tejun Heo, netdev
Driver should call disable_pci_device() if it returns from pci_probe()
with error.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
drivers/isdn/hardware/mISDN/mISDNinfineon.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index d2dd61d..af25e1f 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -1094,6 +1094,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pr_info("mISDN: do not have informations about adapter at %s\n",
pci_name(pdev));
kfree(card);
+ pci_disable_device(pdev);
return -EINVAL;
} else
pr_notice("mISDN: found adapter %s at %s\n",
@@ -1103,7 +1104,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_drvdata(pdev, card);
err = setup_instance(card);
if (err) {
- pci_disable_device(card->pdev);
+ pci_disable_device(pdev);
kfree(card);
pci_set_drvdata(pdev, NULL);
} else if (ent->driver_data == INF_SCT_1) {
@@ -1114,6 +1115,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
sc = kzalloc(sizeof(struct inf_hw), GFP_KERNEL);
if (!sc) {
release_card(card);
+ pci_disable_device(pdev);
return -ENOMEM;
}
sc->irq = card->irq;
@@ -1121,6 +1123,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
sc->ci = card->ci + i;
err = setup_instance(sc);
if (err) {
+ pci_disable_device(pdev);
kfree(sc);
release_card(card);
break;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 09/18 v2] isdn: mISDN: call disable_pci_device() if pci_probe() failed
2010-08-09 19:50 [PATCH 09/18 v2] isdn: mISDN: call disable_pci_device() if pci_probe() failed Kulikov Vasiliy
@ 2010-08-10 8:43 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-08-10 8:43 UTC (permalink / raw)
To: segooon
Cc: kernel-janitors, isdn, akpm, u.kleine-koenig, peterhuewe, tj,
netdev
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Mon, 9 Aug 2010 23:50:53 +0400
> Driver should call disable_pci_device() if it returns from pci_probe()
> with error.
>
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Also applied, and likewise disable_pci_device() needed to be fixed up.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-10 8:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-09 19:50 [PATCH 09/18 v2] isdn: mISDN: call disable_pci_device() if pci_probe() failed Kulikov Vasiliy
2010-08-10 8:43 ` David Miller
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).