From: Albert H. <he...@us...> - 2008-09-13 19:43:17
|
Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13650/drivers/block/gcn-di Modified Files: gcn-di.c Log Message: Merged 2.6.25. Queued small fixes for: - starlet-es - starlet-ipc - starlet-stm - rvl-stsd - rvl-sthcd - gcn-ai Index: gcn-di.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- gcn-di.c 27 Mar 2008 22:35:36 -0000 1.23 +++ gcn-di.c 13 Sep 2008 19:42:53 -0000 1.24 @@ -1827,7 +1827,7 @@ struct di_device *ddev = cmd->ddev; struct request *req; unsigned long flags; - int uptodate = (cmd->result & DI_SR_TCINT)?1:0; + int error = (cmd->result & DI_SR_TCINT)?0:-EIO; spin_lock_irqsave(&ddev->lock, flags); @@ -1837,11 +1837,7 @@ spin_unlock_irqrestore(&ddev->lock, flags); if (req) { - if (!end_that_request_first(req, uptodate, - req->current_nr_sectors)) { - add_disk_randomness(req->rq_disk); - end_that_request_last(req, uptodate); - } + __blk_end_request(req, error, req->current_nr_sectors << 9); spin_lock_irqsave(&ddev->queue_lock, flags); blk_start_queue(ddev->queue); spin_unlock_irqrestore(&ddev->queue_lock, flags); |