em28xx IR fixup and explicit compat_ioctl32 handler

- Commented the code to avoid repeating events when pressing IR keys.
- Included explicit compat_ioctl32 handler.

CC: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

6 files changed, 20 insertions, 5 deletions

diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134
index efb708ec1..53cd3e7e9 100644
--- a/linux/Documentation/video4linux/CARDLIST.saa7134
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134
@@ -81,4 +81,3 @@
  80 -> ASUS Digimatrix TV                       [1043:0210]
  81 -> Philips Tiger reference design           [1131:2018]
  82 -> MSI TV@Anywhere plus                     [1462:6231]
-
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 303d78b1b..ff2705492 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bttv-driver.c,v 1.67 2005/11/09 18:30:51 mchehab Exp $
+    $Id: bttv-driver.c,v 1.68 2005/11/10 12:40:42 mchehab Exp $
 
     bttv - Bt848 frame grabber driver
 
@@ -3115,7 +3115,9 @@ static struct file_operations bttv_fops =
 	.open	  = bttv_open,
 	.release  = bttv_release,
 	.ioctl	  = bttv_ioctl,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek	  = no_llseek,
 	.read	  = bttv_read,
 	.mmap	  = bttv_mmap,
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 910c773f7..2fc3080d9 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-video.c,v 1.101 2005/11/09 18:30:51 mchehab Exp $
+ * $Id: cx88-video.c,v 1.102 2005/11/10 12:40:42 mchehab Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * video4linux video interface
@@ -2031,7 +2031,9 @@ static struct file_operations video_fops =
 	.poll          = video_poll,
 	.mmap	       = video_mmap,
 	.ioctl	       = video_ioctl,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
 	.compat_ioctl  = v4l_compat_ioctl32,
+#endif
 	.llseek        = no_llseek,
 };
 
@@ -2059,7 +2061,9 @@ static struct file_operations radio_fops =
 	.open          = video_open,
 	.release       = video_release,
 	.ioctl         = radio_ioctl,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
 	.compat_ioctl  = v4l_compat_ioctl32,
+#endif
 	.llseek        = no_llseek,
 };
 
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c
index dd5edd10c..ad71ac931 100644
--- a/linux/drivers/media/video/em28xx/em28xx-input.c
+++ b/linux/drivers/media/video/em28xx/em28xx-input.c
@@ -121,9 +121,11 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 	if (buf[1]==0xff)
 		return 0;
 
-	/* avoid fast reapeating */
+#if 0 /* Keep */
+	/* avoid reapeating keystrokes */
 	if (buf[1]==ir->old)
 		return 0;
+#endif
 	ir->old=buf[1];
 
 	/* Rearranges bits to the right order */
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 890ed2715..0b4256e6d 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -1747,6 +1747,10 @@ static struct file_operations em28xx_v4l_fops = {
 	.poll = em28xx_v4l2_poll,
 	.mmap = em28xx_v4l2_mmap,
 	.llseek = no_llseek,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
+	.compat_ioctl   = v4l_compat_ioctl32,
+#endif
+
 };
 
 /******************************** usb interface *****************************************/
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c
index c9af508cb..d453265ba 100644
--- a/linux/drivers/media/video/saa7134/saa7134-video.c
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-video.c,v 1.47 2005/11/09 18:30:51 mchehab Exp $
+ * $Id: saa7134-video.c,v 1.48 2005/11/10 12:40:43 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -2273,7 +2273,9 @@ static struct file_operations video_fops =
 	.poll     = video_poll,
 	.mmap	  = video_mmap,
 	.ioctl	  = video_ioctl,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek   = no_llseek,
 };
 
@@ -2283,7 +2285,9 @@ static struct file_operations radio_fops =
 	.open	  = video_open,
 	.release  = video_release,
 	.ioctl	  = radio_ioctl,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
 	.compat_ioctl	= v4l_compat_ioctl32,
+#endif
 	.llseek   = no_llseek,
 };