renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
Code

[media] Fix regression in some dib0700 based devices

Browse Source 
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>
This commit is contained in:
James Harper 2014-06-08 21:24:20 -03:00 committed by Mauro Carvalho Chehab
parent 64438fe65a
commit 9e334c7564
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/dvb-usb/dib0700_devices.c
View File

@ -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); adap->fe_adap[0].fe = state->dib7000p_ops.init(&adap->dev->i2c_adap, 18, &stk7700p_dib7000p_config);
st->is_dib7000pc = 1; st->is_dib7000pc = 1;
} else { } else {
dvb_detach(&state->dib7000p_ops);
memset(&state->dib7000p_ops, 0, sizeof(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); 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), DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
}}, }},
.size_of_priv = sizeof(struct dib0700_adapter_state),
}, },
}, },