[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <7ba7ca462a998d8cfc4486ca6fe0940e90a20ff9.1242739648.git.kkeil@pingi.linux-pingi.de>
Date: Tue, 19 May 2009 15:58:26 +0200
From: Karsten Keil <keil@...systems.de>
To: linux-kernel@...r.kernel.org
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
i4ldeveloper@...tserv.isdn4linux.de
Subject: [PATCH 06/19] Fix hfcmulti's PCI IRQ bug during init
From: Andreas Eversberg <andreas@...rsberg.eu>
Not all devices have a hc->pci_dev.
Signed-off-by: Andreas Eversberg <andreas@...rsberg.eu>
Signed-off-by: Karsten Keil <keil@...systems.de>
---
drivers/isdn/hardware/mISDN/hfcmulti.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 9bd85ae..2fbcb92 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5348,7 +5348,7 @@ hfcmulti_init(struct hm_map *m, struct pci_dev *pdev,
hc->iclock = mISDN_register_clock("HFCMulti", 0, clockctl, hc);
/* initialize hardware */
- hc->irq = m->irq;
+ hc->irq = (m->irq) ? : hc->pci_dev->irq;
ret_err = init_card(hc);
if (ret_err) {
printk(KERN_ERR "init card returns %d\n", ret_err);
@@ -5549,7 +5549,6 @@ hfcmulti_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
"Please contact the driver maintainer for support.\n");
return -ENODEV;
}
- m->irq = pdev->irq;
ret = hfcmulti_init(m, pdev, ent);
if (ret)
return ret;
--
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists