aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index c5adb7b9c5b5..2752509531b7 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1022,6 +1022,7 @@ static int init_irq (ide_hwif_t *hwif)
1022 unsigned int index; 1022 unsigned int index;
1023 ide_hwgroup_t *hwgroup; 1023 ide_hwgroup_t *hwgroup;
1024 ide_hwif_t *match = NULL; 1024 ide_hwif_t *match = NULL;
1025 int sa = 0;
1025 1026
1026 mutex_lock(&ide_cfg_mtx); 1027 mutex_lock(&ide_cfg_mtx);
1027 hwif->hwgroup = NULL; 1028 hwif->hwgroup = NULL;
@@ -1076,24 +1077,18 @@ static int init_irq (ide_hwif_t *hwif)
1076 1077
1077 ide_ports[hwif->index] = hwif; 1078 ide_ports[hwif->index] = hwif;
1078 1079
1079 /*
1080 * Allocate the irq, if not already obtained for another hwif
1081 */
1082 if (!match || match->irq != hwif->irq) {
1083 int sa = 0;
1084#if defined(__mc68000__) 1080#if defined(__mc68000__)
1085 sa = IRQF_SHARED; 1081 sa = IRQF_SHARED;
1086#endif /* __mc68000__ */ 1082#endif /* __mc68000__ */
1087 1083
1088 if (hwif->chipset == ide_pci) 1084 if (hwif->chipset == ide_pci)
1089 sa = IRQF_SHARED; 1085 sa = IRQF_SHARED;
1090 1086
1091 if (io_ports->ctl_addr) 1087 if (io_ports->ctl_addr)
1092 hwif->tp_ops->set_irq(hwif, 1); 1088 hwif->tp_ops->set_irq(hwif, 1);
1093 1089
1094 if (request_irq(hwif->irq,&ide_intr,sa,hwif->name,hwgroup)) 1090 if (request_irq(hwif->irq, &ide_intr, sa, hwif->name, hwif))
1095 goto out_unlink; 1091 goto out_unlink;
1096 }
1097 1092
1098 if (!hwif->rqsize) { 1093 if (!hwif->rqsize) {
1099 if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) || 1094 if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||