aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb/m920x.c
diff options
context:
space:
mode:
authorPatrick Boettcher <patrick.boettcher@desy.de>2006-09-28 13:48:03 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:51 -0200
commit94a47dc4335a614eba30cf29aa3a953040625c92 (patch)
tree9f4bac3430ca0203f751ea299a6931b298e6b86e /drivers/media/dvb/dvb-usb/m920x.c
parent26f48eaa9e57a3436fc049f30241256dda002de5 (diff)
V4L/DVB (5132): M920x: more trivial cleanups
- Removed some needless brances - Removed an unneeded check for adapter[0] - Removed unneeded declaration of .generic_bulk_ctrl_endpoint = 0x01 Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/m920x.c')
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index 14b32ff40ed..9e5ec080529 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -138,12 +138,6 @@ static int m9206_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nu
int i;
int ret = 0;
- /* Need to access d->adapter[0] */
- if (d->num_adapters_initialized != 1) {
- deb_rc("Impossible happened!\n");
- return -EINVAL;
- }
-
if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
return -EAGAIN;
@@ -247,9 +241,8 @@ static int megasky_frontend_attach(struct dvb_usb_adapter *adap)
{
deb_rc("megasky_frontend_attach!\n");
- if ((adap->fe = dvb_attach(mt352_attach, &megasky_mt352_config, &adap->dev->i2c_adap)) != NULL) {
+ if ((adap->fe = dvb_attach(mt352_attach, &megasky_mt352_config, &adap->dev->i2c_adap)) != NULL)
return 0;
- }
return -EIO;
}
@@ -474,8 +467,6 @@ static struct dvb_usb_device_properties megasky_properties = {
}},
.i2c_algo = &m9206_i2c_algo,
- .generic_bulk_ctrl_endpoint = 0x01,
-
.num_device_descs = 1,
.devices = {
{ "MSI Mega Sky 580 DVB-T USB2.0",