diff options
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r-- | drivers/ide/ide-taskfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index a839b2a8f6f4..97a9244312fc 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -27,7 +27,6 @@ | |||
27 | * request. | 27 | * request. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/config.h> | ||
31 | #include <linux/module.h> | 30 | #include <linux/module.h> |
32 | #include <linux/types.h> | 31 | #include <linux/types.h> |
33 | #include <linux/string.h> | 32 | #include <linux/string.h> |
@@ -223,7 +222,7 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive) | |||
223 | ide_hwif_t *hwif = HWIF(drive); | 222 | ide_hwif_t *hwif = HWIF(drive); |
224 | u8 stat; | 223 | u8 stat; |
225 | 224 | ||
226 | local_irq_enable(); | 225 | local_irq_enable_in_hardirq(); |
227 | if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),READY_STAT,BAD_STAT)) { | 226 | if (!OK_STAT(stat = hwif->INB(IDE_STATUS_REG),READY_STAT,BAD_STAT)) { |
228 | return ide_error(drive, "task_no_data_intr", stat); | 227 | return ide_error(drive, "task_no_data_intr", stat); |
229 | /* calls ide_end_drive_cmd */ | 228 | /* calls ide_end_drive_cmd */ |