diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:36 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:36 -0400 |
commit | 90d2c6bc68745d67cdbf00bab43818d90aa0dfb6 (patch) | |
tree | 35bbf470ecc6cb5bed25b3d95bf36a9b3be86688 | |
parent | e27420d046600cd3e4139ea1b6cba59a8b4050eb (diff) |
ide: enable local IRQs in all handlers for TASKFILE_NO_DATA data phase
It is already done by task_no_data_intr() and there is no reason
not to do it in other TASKFILE_NO_DATA data phase handlers.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/ide-taskfile.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index aeddbbd69e86..7fb6f1c86272 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -126,7 +126,10 @@ EXPORT_SYMBOL_GPL(do_rw_taskfile); | |||
126 | static ide_startstop_t set_multmode_intr(ide_drive_t *drive) | 126 | static ide_startstop_t set_multmode_intr(ide_drive_t *drive) |
127 | { | 127 | { |
128 | ide_hwif_t *hwif = drive->hwif; | 128 | ide_hwif_t *hwif = drive->hwif; |
129 | u8 stat = hwif->tp_ops->read_status(hwif); | 129 | u8 stat; |
130 | |||
131 | local_irq_enable_in_hardirq(); | ||
132 | stat = hwif->tp_ops->read_status(hwif); | ||
130 | 133 | ||
131 | if (OK_STAT(stat, READY_STAT, BAD_STAT)) | 134 | if (OK_STAT(stat, READY_STAT, BAD_STAT)) |
132 | drive->mult_count = drive->mult_req; | 135 | drive->mult_count = drive->mult_req; |
@@ -147,6 +150,8 @@ static ide_startstop_t set_geometry_intr(ide_drive_t *drive) | |||
147 | int retries = 5; | 150 | int retries = 5; |
148 | u8 stat; | 151 | u8 stat; |
149 | 152 | ||
153 | local_irq_enable_in_hardirq(); | ||
154 | |||
150 | while (1) { | 155 | while (1) { |
151 | stat = hwif->tp_ops->read_status(hwif); | 156 | stat = hwif->tp_ops->read_status(hwif); |
152 | if ((stat & BUSY_STAT) == 0 || retries-- == 0) | 157 | if ((stat & BUSY_STAT) == 0 || retries-- == 0) |
@@ -170,7 +175,10 @@ static ide_startstop_t set_geometry_intr(ide_drive_t *drive) | |||
170 | static ide_startstop_t recal_intr(ide_drive_t *drive) | 175 | static ide_startstop_t recal_intr(ide_drive_t *drive) |
171 | { | 176 | { |
172 | ide_hwif_t *hwif = drive->hwif; | 177 | ide_hwif_t *hwif = drive->hwif; |
173 | u8 stat = hwif->tp_ops->read_status(hwif); | 178 | u8 stat; |
179 | |||
180 | local_irq_enable_in_hardirq(); | ||
181 | stat = hwif->tp_ops->read_status(hwif); | ||
174 | 182 | ||
175 | if (!OK_STAT(stat, READY_STAT, BAD_STAT)) | 183 | if (!OK_STAT(stat, READY_STAT, BAD_STAT)) |
176 | return ide_error(drive, "recal_intr", stat); | 184 | return ide_error(drive, "recal_intr", stat); |