---

yaml --- r: 33651 b: refs/heads/master c: 36e8e57 h: refs/heads/master i: 33649: f24965b 33647: 0e0c5ad v: v3
git-mirror · Aug 27, 2006 · f18978b · f18978b
1 parent 41f53db
commit f18978b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e54bdaa9cf55d7e74409ea288b705c144b2627e
+refs/heads/master: 36e8e5783297fbb83bdebe7e245ef659958f23cb
diff --git a/trunk/drivers/scsi/ide-scsi.c b/trunk/drivers/scsi/ide-scsi.c
@@ -517,7 +517,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
 		/* No more interrupts */
 		if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
 			printk (KERN_INFO "Packet command completed, %d bytes transferred\n", pc->actually_transferred);
-		local_irq_enable();
+		local_irq_enable_in_hardirq();
 		if (status.b.check)
 			rq->errors++;
 		idescsi_end_request (drive, 1, 0);