aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-14 19:19:02 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-14 19:19:02 +0100
commit9b896033aa2781d36b2d3f756fe70325fc8487e2 (patch)
tree561541dae80ce870c9572cf59b46a119ce57e356 /drivers/ide/ide-iops.c
parenta6525042bfdfcab128bd91fad264de10fd24a55e (diff)
downloadkernel_samsung_smdk4412-9b896033aa2781d36b2d3f756fe70325fc8487e2.zip
kernel_samsung_smdk4412-9b896033aa2781d36b2d3f756fe70325fc8487e2.tar.gz
kernel_samsung_smdk4412-9b896033aa2781d36b2d3f756fe70325fc8487e2.tar.bz2
ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal
commit 54cc1428cfa619e16d75baae8cb041a2eff015f0 ("ide: remove local_irq_set() macro") accidentally replaced local_save_flags() by local_irq_set() in ide_probe_port() and __ide_wait_stat() which resulted in LOCKDEP breakage. Reported-by: Larry Finger <Larry.Finger@lwfinger.net> Tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index e728cfe..753b92e 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -493,7 +493,7 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti
stat = tp_ops->read_status(hwif);
if (stat & ATA_BUSY) {
- local_irq_save(flags);
+ local_save_flags(flags);
local_irq_enable_in_hardirq();
timeout += jiffies;
while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {