[linux-dvb] Re: MSI Megasky 580 using Uli m9206 -- http://linuxtv.org/hg/~mkrufky/m920x

Patrick Boettcher patrick.boettcher at desy.de
Thu Sep 28 15:02:34 CEST 2006


Attached my very minor suggestions.

Your repository (even without that patch):

Acked-by: Patrick Boettcher <pb at linuxtv.org>

On Thu, 28 Sep 2006, Michael Krufky wrote:

> Aapo Tahkola wrote:
> > On Wed, 27 Sep 2006 13:16:36 +0200 (CEST)
> > Patrick Boettcher <patrick.boettcher at desy.de> wrote:
> > 
> >> Hi Micheal,
> >>
> >> Attached you'll find my suggestions to your current tree.
> 
> First I applied Aapo's patch, then I incorporated suggestions from
> Patrick and Aapo in this email thread.
> 
> http://linuxtv.org/hg/~mkrufky/m920x has been updated by the following:
> 
> - m920x: misc updates and fixes
> - m920x: more cleanups
> 
>  dvb-usb/m920x.c    |  346 ++++++++++++++++++---------------
>  dvb-usb/m920x.h    |   30 ++
>  frontends/qt1010.h |    7
>  3 files changed, 214 insertions(+), 169 deletions(-)
> 
> 
> How does this look now?
> 
> -Mike
> 
-------------- next part --------------
diff -r 4f3d1448e3c9 linux/drivers/media/dvb/dvb-usb/m920x.c
--- a/linux/drivers/media/dvb/dvb-usb/m920x.c	Thu Sep 28 00:46:49 2006 -0400
+++ b/linux/drivers/media/dvb/dvb-usb/m920x.c	Thu Sep 28 14:56:13 2006 +0200
@@ -145,6 +145,8 @@ static int m9206_i2c_xfer(struct i2c_ada
 	int i;
 	int ret = 0;
 
+	/* You do not trust dvb-usb :) */
+
 	/* Need to access d->adapter[0] */
 	if (d->num_adapters_initialized != 1) {
 		deb_rc("Impossible happened!\n");
@@ -254,9 +256,8 @@ static int megasky_frontend_attach(struc
 {
 	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;
 }
 
@@ -439,7 +440,7 @@ static int m920x_probe(struct usb_interf
 
 static struct usb_device_id m920x_table [] = {
 		{ USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580) },
-		{ }		/* Terminating entry */
+		{ NULL } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, m920x_table);
 
@@ -481,8 +482,6 @@ static struct dvb_usb_device_properties 
 	}},
 	.i2c_algo         = &m9206_i2c_algo,
 
-	.generic_bulk_ctrl_endpoint = 0x01,
-
 	.num_device_descs = 1,
 	.devices = {
 		{   "MSI Mega Sky 580 DVB-T USB2.0",


More information about the linux-dvb mailing list