The patch number 14392 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: M?rton N?meth <[email protected]>
bttv: fix compiler warning before kernel 2.6.30
Fix the following compiler warnings when compiling before Linux
kernel version 2.6.30:
bttv-i2c.c: In function 'init_bttv_i2c':
bttv-i2c.c:440: warning: control reaches end of non-void function
Priority: normal
Signed-off-by: M?rton N?meth <[email protected]>
Acked-by: Jean Delvare <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/drivers/media/video/bt8xx/bttv-i2c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -r 41c5482f2dac -r 72846c99c0f7 linux/drivers/media/video/bt8xx/bttv-i2c.c
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c Thu Mar 04 02:49:46
2010 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c Sat Mar 06 09:04:27
2010 -0300
@@ -409,7 +409,6 @@
}
if (0 == btv->i2c_rc && i2c_scan)
do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
return btv->i2c_rc;
}
@@ -417,6 +416,7 @@
/* Instantiate the I2C IR receiver device, if present */
void __devinit init_bttv_i2c_ir(struct bttv *btv)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
if (0 == btv->i2c_rc) {
struct i2c_board_info info;
/* The external IR receiver is at i2c address 0x34 (0x35 for
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/72846c99c0f7960814b2925eb357b4270ecf0330
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
