diff options
| author | James Harper | 2014-06-09 02:24:20 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-07-26 05:51:02 +0200 |
| commit | 9e334c75642b6e5bfb956bf0e45f1d3afa271b67 (patch) | |
| tree | 26e580b2f0edad119e5e3a33f8acfe89ff4d9fa0 | |
| parent | [media] staging: lirc: remove sa1100 support (diff) | |
| download | kernel-qcow2-linux-9e334c75642b6e5bfb956bf0e45f1d3afa271b67.tar.gz kernel-qcow2-linux-9e334c75642b6e5bfb956bf0e45f1d3afa271b67.tar.xz kernel-qcow2-linux-9e334c75642b6e5bfb956bf0e45f1d3afa271b67.zip | |
[media] Fix regression in some dib0700 based devices
Fix regression in some dib0700 based devices.
Set size_of_priv, and don't call dvb_detach unnecessarily.
This resolves the oops(s) for my "Leadtek Winfast DTV Dongle (STK7700P based)"
Signed-off-by: James Harper <james.harper@ejbdigital.com.au>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/media/usb/dvb-usb/dib0700_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c index 91e5ebb0f2c7..ce47d3f1c850 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c @@ -723,7 +723,6 @@ static int stk7700p_frontend_attach(struct dvb_usb_adapter *adap) adap->fe_adap[0].fe = state->dib7000p_ops.init(&adap->dev->i2c_adap, 18, &stk7700p_dib7000p_config); st->is_dib7000pc = 1; } else { - dvb_detach(&state->dib7000p_ops); memset(&state->dib7000p_ops, 0, sizeof(state->dib7000p_ops)); adap->fe_adap[0].fe = dvb_attach(dib7000m_attach, &adap->dev->i2c_adap, 18, &stk7700p_dib7000m_config); } @@ -3804,6 +3803,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { DIB0700_DEFAULT_STREAMING_CONFIG(0x02), }}, + .size_of_priv = sizeof(struct dib0700_adapter_state), }, }, |