mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
113 lines
4.7 KiB
Diff
113 lines
4.7 KiB
Diff
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
|
|
index 6020170fe99a..92098c1b78e5 100644
|
|
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
|
|
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
|
|
@@ -291,7 +291,7 @@ static int stk7700P2_frontend_attach(struct dvb_usb_adapter *adap)
|
|
stk7700d_dib7000p_mt2266_config)
|
|
!= 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n", __func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
@@ -325,7 +325,7 @@ static int stk7700d_frontend_attach(struct dvb_usb_adapter *adap)
|
|
stk7700d_dib7000p_mt2266_config)
|
|
!= 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n", __func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
@@ -478,7 +478,7 @@ static int stk7700ph_frontend_attach(struct dvb_usb_adapter *adap)
|
|
&stk7700ph_dib7700_xc3028_config) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n",
|
|
__func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
|
|
@@ -1010,7 +1010,7 @@ static int stk7070p_frontend_attach(struct dvb_usb_adapter *adap)
|
|
&dib7070p_dib7000p_config) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n",
|
|
__func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
|
|
@@ -1068,7 +1068,7 @@ static int stk7770p_frontend_attach(struct dvb_usb_adapter *adap)
|
|
&dib7770p_dib7000p_config) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n",
|
|
__func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
|
|
@@ -3056,7 +3056,7 @@ static int nim7090_frontend_attach(struct dvb_usb_adapter *adap)
|
|
|
|
if (state->dib7000p_ops.i2c_enumeration(&adap->dev->i2c_adap, 1, 0x10, &nim7090_dib7000p_config) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n", __func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
adap->fe_adap[0].fe = state->dib7000p_ops.init(&adap->dev->i2c_adap, 0x80, &nim7090_dib7000p_config);
|
|
@@ -3109,7 +3109,7 @@ static int tfe7090pvr_frontend0_attach(struct dvb_usb_adapter *adap)
|
|
/* initialize IC 0 */
|
|
if (state->dib7000p_ops.i2c_enumeration(&adap->dev->i2c_adap, 1, 0x20, &tfe7090pvr_dib7000p_config[0]) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n", __func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
|
|
@@ -3139,7 +3139,7 @@ static int tfe7090pvr_frontend1_attach(struct dvb_usb_adapter *adap)
|
|
i2c = state->dib7000p_ops.get_i2c_master(adap->dev->adapter[0].fe_adap[0].fe, DIBX000_I2C_INTERFACE_GPIO_6_7, 1);
|
|
if (state->dib7000p_ops.i2c_enumeration(i2c, 1, 0x10, &tfe7090pvr_dib7000p_config[1]) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n", __func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
|
|
@@ -3214,7 +3214,7 @@ static int tfe7790p_frontend_attach(struct dvb_usb_adapter *adap)
|
|
1, 0x10, &tfe7790p_dib7000p_config) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n",
|
|
__func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
adap->fe_adap[0].fe = state->dib7000p_ops.init(&adap->dev->i2c_adap,
|
|
@@ -3309,7 +3309,7 @@ static int stk7070pd_frontend_attach0(struct dvb_usb_adapter *adap)
|
|
stk7070pd_dib7000p_config) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n",
|
|
__func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
|
|
@@ -3384,7 +3384,7 @@ static int novatd_frontend_attach(struct dvb_usb_adapter *adap)
|
|
stk7070pd_dib7000p_config) != 0) {
|
|
err("%s: state->dib7000p_ops.i2c_enumeration failed. Cannot continue\n",
|
|
__func__);
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
@@ -3620,7 +3620,7 @@ static int pctv340e_frontend_attach(struct dvb_usb_adapter *adap)
|
|
|
|
if (state->dib7000p_ops.dib7000pc_detection(&adap->dev->i2c_adap) == 0) {
|
|
/* Demodulator not found for some reason? */
|
|
- dvb_detach(&state->dib7000p_ops);
|
|
+ dvb_detach(state->dib7000p_ops.set_wbd_ref);
|
|
return -ENODEV;
|
|
}
|
|
|