aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-12-29 14:27:33 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-12-29 14:27:33 -0500
commitf58c1ab8deebc2360cef998f169a6727c288210f (patch)
treed3bd8a05ae227cb1bcabd55444b54cbac82764fb /drivers/ide/ide-probe.c
parent46aa7af1d6bf46d0973dc9e8f13275f2c001d3dd (diff)
ide: always set nIEN on idle devices
* Set nIEN for previous port/device in ide_do_request() also if port uses a non-shared IRQ. * Remove no longer needed ide_hwif_t.sharing_irq. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index a0eb72e2a026..81f61e8ea97f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1060,7 +1060,6 @@ static int init_irq (ide_hwif_t *hwif)
1060 1060
1061 if (h && h->hwgroup) { /* scan only initialized ports */ 1061 if (h && h->hwgroup) { /* scan only initialized ports */
1062 if (hwif->irq == h->irq) { 1062 if (hwif->irq == h->irq) {
1063 hwif->sharing_irq = h->sharing_irq = 1;
1064 if (hwif->chipset != ide_pci || 1063 if (hwif->chipset != ide_pci ||
1065 h->chipset != ide_pci) { 1064 h->chipset != ide_pci) {
1066 save_match(hwif, h, &match); 1065 save_match(hwif, h, &match);
@@ -1152,8 +1151,7 @@ static int init_irq (ide_hwif_t *hwif)
1152 io_ports->data_addr, hwif->irq); 1151 io_ports->data_addr, hwif->irq);
1153#endif /* __mc68000__ */ 1152#endif /* __mc68000__ */
1154 if (match) 1153 if (match)
1155 printk(KERN_CONT " (%sed with %s)", 1154 printk(KERN_CONT " (serialized with %s)", match->name);
1156 hwif->sharing_irq ? "shar" : "serializ", match->name);
1157 printk(KERN_CONT "\n"); 1155 printk(KERN_CONT "\n");
1158 1156
1159 mutex_unlock(&ide_cfg_mtx); 1157 mutex_unlock(&ide_cfg_mtx);