From bac8945044ece3457d277f64b9faba3b3b1179ea Mon Sep 17 00:00:00 2001
From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Date: Wed, 1 Oct 2008 10:13:02 -0400
Subject: [PATCH] --- yaml --- r: 110559 b: refs/heads/master c:
 7afb3a6e752503d5ebeb038336aa0fa886a51b44 h: refs/heads/master i:   110557:
 9cb05e2d53d577bec508be0b85ae5c478ec1eb9c   110555:
 ea3df2aa4b5ef7f1e5f169cd0f654b4659b72895   110551:
 86e5770ad7beb86ae5ec04af72a735583b6324c2   110543:
 dc00f98dcbfde86dffa93d4375d3207c28b8c65d   110527:
 659262666628812087dbc3028aea9f9b5b27a760 v: v3

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

diff --git a/[refs] b/[refs]
index 786ffff36674..4428831d025c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a9df5055a99df25533daf4041fdb99f0ed3463c
+refs/heads/master: 7afb3a6e752503d5ebeb038336aa0fa886a51b44
diff --git a/trunk/drivers/cdrom/gdrom.c b/trunk/drivers/cdrom/gdrom.c
index 1231d95aa695..d6ba77a2dd7b 100644
--- a/trunk/drivers/cdrom/gdrom.c
+++ b/trunk/drivers/cdrom/gdrom.c
@@ -624,14 +624,14 @@ static void gdrom_readdisk_dma(struct work_struct *work)
 		ctrl_outb(1, GDROM_DMA_STATUS_REG);
 		wait_event_interruptible_timeout(request_queue,
 			gd.transfer == 0, GDROM_DEFAULT_TIMEOUT);
-		err = gd.transfer;
+		err = gd.transfer ? -EIO : 0;
 		gd.transfer = 0;
 		gd.pending = 0;
 		/* now seek to take the request spinlock
 		* before handling ending the request */
 		spin_lock(&gdrom_lock);
 		list_del_init(&req->queuelist);
-		end_dequeued_request(req, 1 - err);
+		__blk_end_request(req, err, blk_rq_bytes(req));
 	}
 	spin_unlock(&gdrom_lock);
 	kfree(read_command);