Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a74216c authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4748): Fixed oops for Nova-T USB2 



When using the remote control with the Nova-T USB there was an Oops because of
the recent DVB-USB-Adapter change.

Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5011915c

drivers/media/dvb/dvb-usb/dibusb.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -99,7 +99,9 @@ 
struct dibusb_state {

struct dibusb_state {

	struct dib_fe_xfer_ops ops;

	struct dib_fe_xfer_ops ops;

	int mt2060_present;

	int mt2060_present;

};





struct dibusb_device_state {

	/* for RC5 remote control */

	/* for RC5 remote control */

	int old_toggle;

	int old_toggle;

	int last_repeat_count;

	int last_repeat_count;

drivers/media/dvb/dvb-usb/nova-t-usb2.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state) 
	u8 key[5],cmd[2] = { DIBUSB_REQ_POLL_REMOTE, 0x35 }, data,toggle,custom;

	u8 key[5],cmd[2] = { DIBUSB_REQ_POLL_REMOTE, 0x35 }, data,toggle,custom;

	u16 raw;

	u16 raw;

	int i;

	int i;

	struct dibusb_state *st = d->priv;

	struct dibusb_device_state *st = d->priv;





	dvb_usb_generic_rw(d,cmd,2,key,5,0);

	dvb_usb_generic_rw(d,cmd,2,key,5,0);
@@ -184,6 +184,7 @@ static struct dvb_usb_device_properties nova_t_properties = { 
			.size_of_priv     = sizeof(struct dibusb_state),

			.size_of_priv     = sizeof(struct dibusb_state),

		}

		}

	},

	},

	.size_of_priv     = sizeof(struct dibusb_device_state),





	.power_ctrl       = dibusb2_0_power_ctrl,

	.power_ctrl       = dibusb2_0_power_ctrl,

	.read_mac_address = nova_t_read_mac_address,

	.read_mac_address = nova_t_read_mac_address,