renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 22:53:55 +08:00
Code

media: lmedm04: use dvb_usbv2_generic_rw_locked

Browse Source 
Use dvb-usb-v2 generic usb function for bulk transfers and simplify logic.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Malcolm Priestley 2018-11-29 17:30:25 -05:00 committed by Mauro Carvalho Chehab
parent 8824e5018c
commit d3411f656c
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/media/usb/dvb-usb-v2/lmedm04.c
View File

@ -147,50 +147,30 @@ struct lme2510_state {
u8 dvb_usb_lme2510_firmware; u8 dvb_usb_lme2510_firmware;
}; };
static int lme2510_bulk_write(struct usb_device *dev,
u8 *snd, int len, u8 pipe)
{
int actual_l;
return usb_bulk_msg(dev, usb_sndbulkpipe(dev, pipe),
snd, len, &actual_l, 100);
}
static int lme2510_bulk_read(struct usb_device *dev,
u8 *rev, int len, u8 pipe)
{
int actual_l;
return usb_bulk_msg(dev, usb_rcvbulkpipe(dev, pipe),
rev, len, &actual_l, 200);
}
static int lme2510_usb_talk(struct dvb_usb_device *d, static int lme2510_usb_talk(struct dvb_usb_device *d,
u8 *wbuf, int wlen, u8 *rbuf, int rlen) u8 *wbuf, int wlen, u8 *rbuf, int rlen)
{ {
struct lme2510_state *st = d->priv; struct lme2510_state *st = d->priv;
u8 *buff = st->usb_buffer;
int ret = 0; int ret = 0;
ret = mutex_lock_interruptible(&d->usb_mutex); if (max(wlen, rlen) > sizeof(st->usb_buffer))
return -EINVAL;
ret = mutex_lock_interruptible(&d->usb_mutex);
if (ret < 0) if (ret < 0)
return -EAGAIN; return -EAGAIN;
/* the read/write capped at 64 */ memcpy(st->usb_buffer, wbuf, wlen);
memcpy(buff, wbuf, (wlen < 64) ? wlen : 64);
ret |= lme2510_bulk_write(d->udev, buff, wlen , 0x01); ret = dvb_usbv2_generic_rw_locked(d, st->usb_buffer, wlen,
st->usb_buffer, rlen);
ret |= lme2510_bulk_read(d->udev, buff, (rlen < 64) ? if (rlen)
rlen : 64 , 0x01); memcpy(rbuf, st->usb_buffer, rlen);
if (rlen > 0)
memcpy(rbuf, buff, rlen);
mutex_unlock(&d->usb_mutex); mutex_unlock(&d->usb_mutex);
return (ret < 0) ? -ENODEV : 0; return ret;
} }
static int lme2510_stream_restart(struct dvb_usb_device *d) static int lme2510_stream_restart(struct dvb_usb_device *d)
@ -1259,6 +1239,8 @@ static struct dvb_usb_device_properties lme2510_props = {
.bInterfaceNumber = 0, .bInterfaceNumber = 0,
.adapter_nr = adapter_nr, .adapter_nr = adapter_nr,
.size_of_priv = sizeof(struct lme2510_state), .size_of_priv = sizeof(struct lme2510_state),
.generic_bulk_ctrl_endpoint = 0x01,
.generic_bulk_ctrl_endpoint_response = 0x01,
.download_firmware = lme2510_download_firmware, .download_firmware = lme2510_download_firmware,