aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:20:52 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:20:52 -0500
commit54cc1428cfa619e16d75baae8cb041a2eff015f0 (patch)
tree364fdf6f09ca790c7d0de1cbb0c2d4e0d2797358 /drivers/ide/ide-iops.c
parent898ec223fea2a2df88035e58dbf50f493577e225 (diff)
ide: remove local_irq_set() macro
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 386080ee4608..44ad03bf9cb4 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -503,7 +503,8 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti
503 stat = tp_ops->read_status(hwif); 503 stat = tp_ops->read_status(hwif);
504 504
505 if (stat & ATA_BUSY) { 505 if (stat & ATA_BUSY) {
506 local_irq_set(flags); 506 local_irq_save(flags);
507 local_irq_enable_in_hardirq();
507 timeout += jiffies; 508 timeout += jiffies;
508 while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) { 509 while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {
509 if (time_after(jiffies, timeout)) { 510 if (time_after(jiffies, timeout)) {