From 0edadf13796c8f84e062ba8a8eead75342fbdaa7 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 26 Jun 2006 00:26:17 -0700
Subject: [PATCH] --- yaml --- r: 30275 b: refs/heads/master c:
 3d1c1cc962cebaae6a70fd89a0adb29ad10a2a12 h: refs/heads/master i:   30273:
 7729e716e7d7c8ca44007ce53ac17b96f32414c5   30271:
 9144775590c99a54ee9fdda2e4ac2c835a52d5c6 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ide/ide-lib.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 756549ada7a8..eccd400015c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b6ebe016bf68fc9b3f3f2ce79c1918b0808481c
+refs/heads/master: 3d1c1cc962cebaae6a70fd89a0adb29ad10a2a12
diff --git a/trunk/drivers/ide/ide-lib.c b/trunk/drivers/ide/ide-lib.c
index 16a143133f93..7ddb11828731 100644
--- a/trunk/drivers/ide/ide-lib.c
+++ b/trunk/drivers/ide/ide-lib.c
@@ -485,7 +485,7 @@ static u8 ide_dump_ata_status(ide_drive_t *drive, const char *msg, u8 stat)
 	unsigned long flags;
 	u8 err = 0;
 
-	local_irq_set(flags);
+	local_irq_save(flags);
 	printk("%s: %s: status=0x%02x { ", drive->name, msg, stat);
 	if (stat & BUSY_STAT)
 		printk("Busy ");
@@ -567,7 +567,7 @@ static u8 ide_dump_atapi_status(ide_drive_t *drive, const char *msg, u8 stat)
 
 	status.all = stat;
 	error.all = 0;
-	local_irq_set(flags);
+	local_irq_save(flags);
 	printk("%s: %s: status=0x%02x { ", drive->name, msg, stat);
 	if (status.b.bsy)
 		printk("Busy ");