Merge tag 'media/v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / drivers / media / usb / dvb-usb-v2 / dvbsky.c

diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
index 617a306f6815d1afd161ddd04e320d435c723ced..356fd8e66834ea5883aec2b567615b888b2916fe 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -22,7 +22,6 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver.");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct dvbsky_state {
-       struct mutex stream_mutex;
        u8 ibuf[DVBSKY_BUF_LEN];
        u8 obuf[DVBSKY_BUF_LEN];
        u8 last_lock;
@@ -60,17 +59,19 @@ static int dvbsky_usb_generic_rw(struct dvb_usb_device *d,
 static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff)
 {
        struct dvbsky_state *state = d_to_priv(d);
+       static const u8 obuf_pre[3] = { 0x37, 0, 0 };
+       static const u8 obuf_post[3] = { 0x36, 3, 0 };
        int ret;
-       u8 obuf_pre[3] = { 0x37, 0, 0 };
-       u8 obuf_post[3] = { 0x36, 3, 0 };
 
-       mutex_lock(&state->stream_mutex);
-       ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0);
+       mutex_lock(&d->usb_mutex);
+       memcpy(state->obuf, obuf_pre, 3);
+       ret = dvb_usbv2_generic_write_locked(d, state->obuf, 3);
        if (!ret && onoff) {
                msleep(20);
-               ret = dvbsky_usb_generic_rw(d, obuf_post, 3, NULL, 0);
+               memcpy(state->obuf, obuf_post, 3);
+               ret = dvb_usbv2_generic_write_locked(d, state->obuf, 3);
        }
-       mutex_unlock(&state->stream_mutex);
+       mutex_unlock(&d->usb_mutex);
        return ret;
 }
 
@@ -591,17 +592,7 @@ static int dvbsky_identify_state(struct dvb_usb_device *d, const char **name)
 static int dvbsky_init(struct dvb_usb_device *d)
 {
        struct dvbsky_state *state = d_to_priv(d);
-
-       /* use default interface */
-       /*
-       ret = usb_set_interface(d->udev, 0, 0);
-       if (ret)
-               return ret;
-       */
-       mutex_init(&state->stream_mutex);
-
        state->last_lock = 0;
-
        return 0;
 }
 
@@ -792,6 +783,9 @@ static const struct usb_device_id dvbsky_id_table[] = {
        { DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C,
                &mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C",
                RC_MAP_TOTAL_MEDIA_IN_HAND_02) },
+       { DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C_LITE,
+               &mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C Lite",
+               NULL) },
        { DVB_USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230C2,
                &mygica_t230c_props, "MyGica Mini DVB-T2 USB Stick T230C v2",
                RC_MAP_TOTAL_MEDIA_IN_HAND_02) },