---

yaml --- r: 110559 b: refs/heads/master c: 7afb3a6 h: refs/heads/master i: 110557: 9cb05e2 110555: ea3df2a 110551: 86e5770 110543: dc00f98 110527: 6592626 v: v3
git-mirror · Oct 9, 2008 · bac8945 · bac8945
1 parent 36b8b63
commit bac8945
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);