media: igorplugusb: respect DMA coherency
The coherency rules mean that you cannot embed a buffer inside a descriptor. kmalloc() separately. Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
5b044a1300
commit
b3f820b905
1 changed files with 6 additions and 1 deletions
|
@ -38,7 +38,7 @@ struct igorplugusb {
|
||||||
|
|
||||||
struct timer_list timer;
|
struct timer_list timer;
|
||||||
|
|
||||||
uint8_t buf_in[MAX_PACKET];
|
u8 *buf_in;
|
||||||
|
|
||||||
char phys[64];
|
char phys[64];
|
||||||
};
|
};
|
||||||
|
@ -177,6 +177,9 @@ static int igorplugusb_probe(struct usb_interface *intf,
|
||||||
if (!ir->urb)
|
if (!ir->urb)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
|
ir->buf_in = kmalloc(MAX_PACKET, GFP_KERNEL);
|
||||||
|
if (!ir->buf_in)
|
||||||
|
goto fail;
|
||||||
usb_fill_control_urb(ir->urb, udev,
|
usb_fill_control_urb(ir->urb, udev,
|
||||||
usb_rcvctrlpipe(udev, 0), (uint8_t *)&ir->request,
|
usb_rcvctrlpipe(udev, 0), (uint8_t *)&ir->request,
|
||||||
ir->buf_in, sizeof(ir->buf_in), igorplugusb_callback, ir);
|
ir->buf_in, sizeof(ir->buf_in), igorplugusb_callback, ir);
|
||||||
|
@ -223,6 +226,7 @@ fail:
|
||||||
rc_free_device(ir->rc);
|
rc_free_device(ir->rc);
|
||||||
usb_free_urb(ir->urb);
|
usb_free_urb(ir->urb);
|
||||||
del_timer(&ir->timer);
|
del_timer(&ir->timer);
|
||||||
|
kfree(ir->buf_in);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -236,6 +240,7 @@ static void igorplugusb_disconnect(struct usb_interface *intf)
|
||||||
usb_set_intfdata(intf, NULL);
|
usb_set_intfdata(intf, NULL);
|
||||||
usb_kill_urb(ir->urb);
|
usb_kill_urb(ir->urb);
|
||||||
usb_free_urb(ir->urb);
|
usb_free_urb(ir->urb);
|
||||||
|
kfree(ir->buf_in);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct usb_device_id igorplugusb_table[] = {
|
static const struct usb_device_id igorplugusb_table[] = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue