diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 03:03:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 03:03:38 -0500 |
| commit | 4604096768d3be37ee1a05aee424aceed3e1b56f (patch) | |
| tree | 56010e180bb32be7e57971e4bb617c28d0d09099 /drivers/cdrom | |
| parent | 8df8bb4adf7e4abb48d29dc16c29eda40a64afed (diff) | |
| parent | 126ec9a676f601818dc3a85af0552b146410d888 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] block: document io scheduler allow_merge_fn hook
[PATCH] cfq-iosched: don't allow sync merges across queues
[PATCH] Fixup blk_rq_unmap_user() API
[PATCH] __blk_rq_unmap_user() fails to return error
[PATCH] __blk_rq_map_user() doesn't need to grab the queue_lock
[PATCH] Remove queue merging hooks
[PATCH] ->nr_sectors and ->hard_nr_sectors are not used for BLOCK_PC requests
[PATCH] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request
[PATCH] cciss: set default raid level when reading geometry fails
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index e4a2f8f3a1d7..66d028d30439 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -2139,8 +2139,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2139 | cdi->last_sense = s->sense_key; | 2139 | cdi->last_sense = s->sense_key; |
| 2140 | } | 2140 | } |
| 2141 | 2141 | ||
| 2142 | rq->bio = bio; | 2142 | if (blk_rq_unmap_user(bio)) |
| 2143 | if (blk_rq_unmap_user(rq)) | ||
| 2144 | ret = -EFAULT; | 2143 | ret = -EFAULT; |
| 2145 | 2144 | ||
| 2146 | if (ret) | 2145 | if (ret) |