[PATCH[[2.5][10-11] update analog saa7146 drivers mxb and dpc7146

From: Michael Hunold (hunold@convergence.de)
Date: Tue May 06 2003 - 11:23:39 EST

Hello,

this patch updates the mxb and dpc7146 drivers.

- add MODULE_DEVICE_TABLE entries, so that /sbin/hotplug can handle the
devices
- fixup due to the latest i2c changes

Please apply.

Thanks
Michael Hunold.

diff -uNrwB -x '*.o' --new-file linux-2.5.69/drivers/media/video/dpc7146.c linux-2.5.69.patch/drivers/media/video/dpc7146.c
--- linux-2.5.69/drivers/media/video/dpc7146.c 2003-05-06 13:15:34.000000000 +0200
+++ linux-2.5.69.patch/drivers/media/video/dpc7146.c 2003-04-22 18:30:31.000000000 +0200
@@ -23,10 +23,6 @@
 #include <media/saa7146_vv.h>
 #include <linux/video_decoder.h> /* for saa7111a */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
- #define KBUILD_MODNAME dpc7146
-#endif
-
 #define I2C_SAA7111A 0x24
 
 /* All unused bytes are reserverd. */
@@ -340,6 +336,8 @@
         }
 };
 
+MODULE_DEVICE_TABLE(pci, pci_tbl);
+
 static
 struct saa7146_ext_vv vv_data = {
         .inputs = DPC_INPUTS,
diff -uNrwB -x '*.o' --new-file linux-2.5.69/drivers/media/video/mxb.c linux-2.5.69.patch/drivers/media/video/mxb.c
--- linux-2.5.69/drivers/media/video/mxb.c 2003-05-06 13:16:20.000000000 +0200
+++ linux-2.5.69.patch/drivers/media/video/mxb.c 2003-04-28 19:44:54.000000000 +0200
@@ -26,10 +26,6 @@
 #include <media/saa7146_vv.h>
 #include <linux/video_decoder.h> /* for saa7111a */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
- #define KBUILD_MODNAME mxb
-#endif
-
 #include "mxb.h"
 #include "tea6415c.h"
 #include "tea6420.h"
@@ -436,10 +432,11 @@
                    polling method ... */
                 extension.flags &= ~SAA7146_USE_I2C_IRQ;
                 for(i = 1;;i++) {
- msg.len = mxb_saa7740_init[i].length;
- if (msg.len == -1U) {
+ if( -1 == mxb_saa7740_init[i].length ) {
                                 break;
                         }
+
+ msg.len = mxb_saa7740_init[i].length;
                         msg.buf = &mxb_saa7740_init[i].data[0];
                         if( 1 != (err = i2c_transfer(&mxb->i2c_adapter, &msg, 1))) {
                                 DEB_D(("failed to initialize 'sound arena module'.\n"));

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Wed May 07 2003 - 22:00:27 EST