diff options
author | Sean Young <sean@mess.org> | 2014-12-01 03:48:16 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-04 12:28:53 -0500 |
commit | d0a0a65e277c0cdfb498980e2ae998e0060c1ee4 (patch) | |
tree | 61a79f764fd76d689ffe744c52d06768ea878351 /drivers/media/rc | |
parent | ddc0085e915f34fe56407dfc3ef2362f572d3a09 (diff) |
[media] redrat3: ensure dma is setup properly
This fixes the driver on arm.
Reported-by: Steven Guitton <keltiek@gmail.com>
Tested-by: Steven Guitton <keltiek@gmail.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r-- | drivers/media/rc/redrat3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c index 795b394a5d84..c4def66f9aa2 100644 --- a/drivers/media/rc/redrat3.c +++ b/drivers/media/rc/redrat3.c | |||
@@ -966,7 +966,7 @@ static int redrat3_dev_probe(struct usb_interface *intf, | |||
966 | 966 | ||
967 | rr3->ep_in = ep_in; | 967 | rr3->ep_in = ep_in; |
968 | rr3->bulk_in_buf = usb_alloc_coherent(udev, | 968 | rr3->bulk_in_buf = usb_alloc_coherent(udev, |
969 | le16_to_cpu(ep_in->wMaxPacketSize), GFP_ATOMIC, &rr3->dma_in); | 969 | le16_to_cpu(ep_in->wMaxPacketSize), GFP_KERNEL, &rr3->dma_in); |
970 | if (!rr3->bulk_in_buf) { | 970 | if (!rr3->bulk_in_buf) { |
971 | dev_err(dev, "Read buffer allocation failure\n"); | 971 | dev_err(dev, "Read buffer allocation failure\n"); |
972 | goto error; | 972 | goto error; |
@@ -975,6 +975,8 @@ static int redrat3_dev_probe(struct usb_interface *intf, | |||
975 | pipe = usb_rcvbulkpipe(udev, ep_in->bEndpointAddress); | 975 | pipe = usb_rcvbulkpipe(udev, ep_in->bEndpointAddress); |
976 | usb_fill_bulk_urb(rr3->read_urb, udev, pipe, rr3->bulk_in_buf, | 976 | usb_fill_bulk_urb(rr3->read_urb, udev, pipe, rr3->bulk_in_buf, |
977 | le16_to_cpu(ep_in->wMaxPacketSize), redrat3_handle_async, rr3); | 977 | le16_to_cpu(ep_in->wMaxPacketSize), redrat3_handle_async, rr3); |
978 | rr3->read_urb->transfer_dma = rr3->dma_in; | ||
979 | rr3->read_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
978 | 980 | ||
979 | rr3->ep_out = ep_out; | 981 | rr3->ep_out = ep_out; |
980 | rr3->udev = udev; | 982 | rr3->udev = udev; |