diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /drivers/cdrom | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 7ea0f48f8fa6..2df5cf4ec743 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
| @@ -2133,16 +2133,14 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, | |||
| 2133 | rq->timeout = 60 * HZ; | 2133 | rq->timeout = 60 * HZ; |
| 2134 | bio = rq->bio; | 2134 | bio = rq->bio; |
| 2135 | 2135 | ||
| 2136 | if (rq->bio) | ||
| 2137 | blk_queue_bounce(q, &rq->bio); | ||
| 2138 | |||
| 2139 | if (blk_execute_rq(q, cdi->disk, rq, 0)) { | 2136 | if (blk_execute_rq(q, cdi->disk, rq, 0)) { |
| 2140 | struct request_sense *s = rq->sense; | 2137 | struct request_sense *s = rq->sense; |
| 2141 | ret = -EIO; | 2138 | ret = -EIO; |
| 2142 | cdi->last_sense = s->sense_key; | 2139 | cdi->last_sense = s->sense_key; |
| 2143 | } | 2140 | } |
| 2144 | 2141 | ||
| 2145 | if (blk_rq_unmap_user(bio, len)) | 2142 | rq->bio = bio; |
| 2143 | if (blk_rq_unmap_user(rq)) | ||
| 2146 | ret = -EFAULT; | 2144 | ret = -EFAULT; |
| 2147 | 2145 | ||
| 2148 | if (ret) | 2146 | if (ret) |