mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-12 17:34:30 -05:00
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
|
|
index 5e320fa4a795..992f2011a6ba 100644
|
|
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
|
|
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
|
|
@@ -494,18 +494,23 @@ static int lme2510_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
|
|
|
|
static int lme2510_return_status(struct dvb_usb_device *d)
|
|
{
|
|
- int ret = 0;
|
|
+ int ret;
|
|
u8 *data;
|
|
|
|
- data = kzalloc(10, GFP_KERNEL);
|
|
+ data = kzalloc(6, GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
|
|
- ret |= usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),
|
|
- 0x06, 0x80, 0x0302, 0x00, data, 0x0006, 200);
|
|
- info("Firmware Status: %x (%x)", ret , data[2]);
|
|
+ ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),
|
|
+ 0x06, 0x80, 0x0302, 0x00,
|
|
+ data, 0x6, 200);
|
|
+ if (ret != 6)
|
|
+ ret = -EINVAL;
|
|
+ else
|
|
+ ret = data[2];
|
|
+
|
|
+ info("Firmware Status: %6ph", data);
|
|
|
|
- ret = (ret < 0) ? -ENODEV : data[2];
|
|
kfree(data);
|
|
return ret;
|
|
}
|
|
@@ -1189,6 +1194,7 @@ static int lme2510_get_adapter_count(struct dvb_usb_device *d)
|
|
static int lme2510_identify_state(struct dvb_usb_device *d, const char **name)
|
|
{
|
|
struct lme2510_state *st = d->priv;
|
|
+ int status;
|
|
|
|
usb_reset_configuration(d->udev);
|
|
|
|
@@ -1197,12 +1203,16 @@ static int lme2510_identify_state(struct dvb_usb_device *d, const char **name)
|
|
|
|
st->dvb_usb_lme2510_firmware = dvb_usb_lme2510_firmware;
|
|
|
|
- if (lme2510_return_status(d) == 0x44) {
|
|
+ status = lme2510_return_status(d);
|
|
+ if (status == 0x44) {
|
|
*name = lme_firmware_switch(d, 0);
|
|
return COLD;
|
|
}
|
|
|
|
- return 0;
|
|
+ if (status != 0x47)
|
|
+ return -EINVAL;
|
|
+
|
|
+ return WARM;
|
|
}
|
|
|
|
static int lme2510_get_stream_config(struct dvb_frontend *fe, u8 *ts_type,
|