diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/alim15x3.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index dabd986216fe..8f03cce055fa 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c | |||
@@ -345,19 +345,13 @@ static int ali_cable_override(struct pci_dev *pdev) | |||
345 | * | 345 | * |
346 | * This checks if the controller and the cable are capable | 346 | * This checks if the controller and the cable are capable |
347 | * of UDMA66 transfers. It doesn't check the drives. | 347 | * of UDMA66 transfers. It doesn't check the drives. |
348 | * But see note 2 below! | ||
349 | * | ||
350 | * FIXME: frobs bits that are not defined on newer ALi devicea | ||
351 | */ | 348 | */ |
352 | 349 | ||
353 | static u8 ali_cable_detect(ide_hwif_t *hwif) | 350 | static u8 ali_cable_detect(ide_hwif_t *hwif) |
354 | { | 351 | { |
355 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 352 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
356 | unsigned long flags; | ||
357 | u8 cbl = ATA_CBL_PATA40, tmpbyte; | 353 | u8 cbl = ATA_CBL_PATA40, tmpbyte; |
358 | 354 | ||
359 | local_irq_save(flags); | ||
360 | |||
361 | if (m5229_revision >= 0xC2) { | 355 | if (m5229_revision >= 0xC2) { |
362 | /* | 356 | /* |
363 | * m5229 80-pin cable detection (from Host View) | 357 | * m5229 80-pin cable detection (from Host View) |
@@ -377,8 +371,6 @@ static u8 ali_cable_detect(ide_hwif_t *hwif) | |||
377 | } | 371 | } |
378 | } | 372 | } |
379 | 373 | ||
380 | local_irq_restore(flags); | ||
381 | |||
382 | return cbl; | 374 | return cbl; |
383 | } | 375 | } |
384 | 376 | ||