From 9fa528548f4989b37bd52a039c9a66abee23c438 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 15 Jul 2008 21:21:50 +0200
Subject: [PATCH] --- yaml --- r: 101225 b: refs/heads/master c:
 7e12ca11d65f4cb29ed58ea3948f8c5d4f57b35e h: refs/heads/master i:   101223:
 974cac1425f658893bf195e5ee726de70c248601 v: v3

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

diff --git a/[refs] b/[refs]
index 3e7a641ae91b..6fbdf05835cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff07488346702f554aaeb6aae982540aa0302373
+refs/heads/master: 7e12ca11d65f4cb29ed58ea3948f8c5d4f57b35e
diff --git a/trunk/drivers/scsi/ide-scsi.c b/trunk/drivers/scsi/ide-scsi.c
index d7fd5e550a25..58e30efe7a74 100644
--- a/trunk/drivers/scsi/ide-scsi.c
+++ b/trunk/drivers/scsi/ide-scsi.c
@@ -790,8 +790,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
 	rq->special = (char *) pc;
 	rq->cmd_type = REQ_TYPE_SPECIAL;
 	spin_unlock_irq(host->host_lock);
-	rq->rq_disk = scsi->disk;
-	(void) ide_do_drive_cmd (drive, rq, ide_end);
+	blk_execute_rq_nowait(drive->queue, scsi->disk, rq, 0, NULL);
 	spin_lock_irq(host->host_lock);
 	return 0;
 abort: