diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-11 13:45:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-11 13:45:13 +1000 |
| commit | 67d2c85f5d100ae6136d5ba4e6f3d70425ca2d39 (patch) | |
| tree | 76a6fead6b3c2d81bb0044e86e4f85fb31ca24a1 /drivers/memstick/core/mspro_block.c | |
| parent | 33070bc226308f138215695c4d1d9dc46d5ee0ea (diff) | |
| parent | f68adec3c7155a8bbf32a90cb4c4d0737df045d9 (diff) | |
Merge commit 'block/for-next'
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Diffstat (limited to 'drivers/memstick/core/mspro_block.c')
| -rw-r--r-- | drivers/memstick/core/mspro_block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index de143deb06f0..a41634699f84 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c @@ -826,7 +826,7 @@ static void mspro_block_submit_req(struct request_queue *q) if (msb->eject) { while ((req = elv_next_request(q)) != NULL) - __blk_end_request(req, -ENODEV, blk_rq_bytes(req)); + __blk_end_request_all(req, -ENODEV); return; } |