The patch number 10410 was added via Mauro Carvalho Chehab <mche...@redhat.com>
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 <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/video/cs53l32a.c | 1 -
linux/drivers/media/video/cx18/cx18-av-core.c | 2 +-
linux/drivers/media/video/cx25840/cx25840-core.c | 2 +-
linux/drivers/media/video/gspca/t613.c | 2 +-
linux/drivers/media/video/m52790.c | 1 -
linux/drivers/media/video/saa5246a.c | 1 -
linux/drivers/media/video/saa5249.c | 1 -
linux/drivers/media/video/saa7115.c | 2 +-
linux/drivers/media/video/saa717x.c | 3 +--
linux/drivers/media/video/tda7432.c | 1 -
linux/drivers/media/video/tda9840.c | 1 -
linux/drivers/media/video/tda9875.c | 1 -
linux/drivers/media/video/tea6415c.c | 1 -
linux/drivers/media/video/tea6420.c | 1 -
linux/drivers/media/video/tlv320aic23b.c | 1 -
linux/drivers/media/video/tvmixer.c | 1 -
linux/drivers/media/video/tvp5150.c | 1 -
linux/drivers/media/video/upd64031a.c | 1 -
linux/drivers/media/video/upd64083.c | 1 -
linux/drivers/media/video/vp27smpx.c | 1 -
linux/drivers/media/video/wm8739.c | 1 -
v4l/versions.txt | 4 ++++
22 files changed, 9 insertions(+), 22 deletions(-)
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/cs53l32a.c
--- a/linux/drivers/media/video/cs53l32a.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/cs53l32a.c Sun Feb 01 10:24:06 2009 -0200
@@ -225,7 +225,6 @@ MODULE_DEVICE_TABLE(i2c, cs53l32a_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "cs53l32a",
- .driverid = I2C_DRIVERID_CS53L32A,
.command = cs53l32a_command,
.remove = cs53l32a_remove,
.probe = cs53l32a_probe,
diff -r 138cb0226301 -r afc6afc946c7
linux/drivers/media/video/cx18/cx18-av-core.c
--- a/linux/drivers/media/video/cx18/cx18-av-core.c Sat Jan 31 09:14:24
2009 -0200
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c Sun Feb 01 10:24:06
2009 -0200
@@ -548,7 +548,7 @@ static int set_v4lctrl(struct cx18 *cx,
break;
case V4L2_CID_HUE:
- if (ctrl->value < -127 || ctrl->value > 127) {
+ if (ctrl->value < -128 || ctrl->value > 127) {
CX18_ERR("invalid hue setting %d\n", ctrl->value);
return -ERANGE;
}
diff -r 138cb0226301 -r afc6afc946c7
linux/drivers/media/video/cx25840/cx25840-core.c
--- a/linux/drivers/media/video/cx25840/cx25840-core.c Sat Jan 31 09:14:24
2009 -0200
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c Sun Feb 01 10:24:06
2009 -0200
@@ -782,7 +782,7 @@ static int cx25840_s_ctrl(struct v4l2_su
break;
case V4L2_CID_HUE:
- if (ctrl->value < -127 || ctrl->value > 127) {
+ if (ctrl->value < -128 || ctrl->value > 127) {
v4l_err(client, "invalid hue setting %d\n",
ctrl->value);
return -ERANGE;
}
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/gspca/t613.c
--- a/linux/drivers/media/video/gspca/t613.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/gspca/t613.c Sun Feb 01 10:24:06 2009 -0200
@@ -635,7 +635,7 @@ static int sd_init(struct gspca_dev *gsp
struct sd *sd = (struct sd *) gspca_dev;
int i;
u16 sensor_id;
- u8 test_byte;
+ u8 test_byte = 0;
u16 reg80, reg8e;
static const u8 read_indexs[] =
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/m52790.c
--- a/linux/drivers/media/video/m52790.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/m52790.c Sun Feb 01 10:24:06 2009 -0200
@@ -222,7 +222,6 @@ MODULE_DEVICE_TABLE(i2c, m52790_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "m52790",
- .driverid = I2C_DRIVERID_M52790,
.command = m52790_command,
.probe = m52790_probe,
.remove = m52790_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/saa5246a.c
--- a/linux/drivers/media/video/saa5246a.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/saa5246a.c Sun Feb 01 10:24:06 2009 -0200
@@ -1101,7 +1101,6 @@ MODULE_DEVICE_TABLE(i2c, saa5246a_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "saa5246a",
- .driverid = I2C_DRIVERID_SAA5249,
.probe = saa5246a_probe,
.remove = saa5246a_remove,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/saa5249.c
--- a/linux/drivers/media/video/saa5249.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/saa5249.c Sun Feb 01 10:24:06 2009 -0200
@@ -627,7 +627,6 @@ MODULE_DEVICE_TABLE(i2c, saa5249_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "saa5249",
- .driverid = I2C_DRIVERID_SAA5249,
.probe = saa5249_probe,
.remove = saa5249_remove,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/saa7115.c
--- a/linux/drivers/media/video/saa7115.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/saa7115.c Sun Feb 01 10:24:06 2009 -0200
@@ -779,7 +779,7 @@ static int saa711x_s_ctrl(struct v4l2_su
break;
case V4L2_CID_HUE:
- if (ctrl->value < -127 || ctrl->value > 127) {
+ if (ctrl->value < -128 || ctrl->value > 127) {
v4l2_err(sd, "invalid hue setting %d\n", ctrl->value);
return -ERANGE;
}
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/saa717x.c
--- a/linux/drivers/media/video/saa717x.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/saa717x.c Sun Feb 01 10:24:06 2009 -0200
@@ -937,7 +937,7 @@ static int saa717x_s_ctrl(struct v4l2_su
break;
case V4L2_CID_HUE:
- if (ctrl->value < -127 || ctrl->value > 127) {
+ if (ctrl->value < -128 || ctrl->value > 127) {
v4l2_err(sd, "invalid hue setting %d\n", ctrl->value);
return -ERANGE;
}
@@ -1539,7 +1539,6 @@ MODULE_DEVICE_TABLE(i2c, saa717x_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "saa717x",
- .driverid = I2C_DRIVERID_SAA717X,
.command = saa717x_command,
.probe = saa717x_probe,
.remove = saa717x_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tda7432.c
--- a/linux/drivers/media/video/tda7432.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tda7432.c Sun Feb 01 10:24:06 2009 -0200
@@ -501,7 +501,6 @@ MODULE_DEVICE_TABLE(i2c, tda7432_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tda7432",
- .driverid = I2C_DRIVERID_TDA7432,
.command = tda7432_command,
.probe = tda7432_probe,
.remove = tda7432_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tda9840.c
--- a/linux/drivers/media/video/tda9840.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tda9840.c Sun Feb 01 10:24:06 2009 -0200
@@ -265,7 +265,6 @@ MODULE_DEVICE_TABLE(i2c, tda9840_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tda9840",
- .driverid = I2C_DRIVERID_TDA9840,
.command = tda9840_command,
.probe = tda9840_probe,
.remove = tda9840_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tda9875.c
--- a/linux/drivers/media/video/tda9875.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tda9875.c Sun Feb 01 10:24:06 2009 -0200
@@ -417,7 +417,6 @@ MODULE_DEVICE_TABLE(i2c, tda9875_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tda9875",
- .driverid = I2C_DRIVERID_TDA9875,
.command = tda9875_command,
.probe = tda9875_probe,
.remove = tda9875_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tea6415c.c
--- a/linux/drivers/media/video/tea6415c.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tea6415c.c Sun Feb 01 10:24:06 2009 -0200
@@ -194,7 +194,6 @@ MODULE_DEVICE_TABLE(i2c, tea6415c_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tea6415c",
- .driverid = I2C_DRIVERID_TEA6415C,
.command = tea6415c_command,
.probe = tea6415c_probe,
.remove = tea6415c_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tea6420.c
--- a/linux/drivers/media/video/tea6420.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tea6420.c Sun Feb 01 10:24:06 2009 -0200
@@ -174,7 +174,6 @@ MODULE_DEVICE_TABLE(i2c, tea6420_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tea6420",
- .driverid = I2C_DRIVERID_TEA6420,
.command = tea6420_command,
.probe = tea6420_probe,
.remove = tea6420_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tlv320aic23b.c
--- a/linux/drivers/media/video/tlv320aic23b.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tlv320aic23b.c Sun Feb 01 10:24:06 2009 -0200
@@ -211,7 +211,6 @@ MODULE_DEVICE_TABLE(i2c, tlv320aic23b_id
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tlv320aic23b",
- .driverid = I2C_DRIVERID_TLV320AIC23B,
.command = tlv320aic23b_command,
.probe = tlv320aic23b_probe,
.remove = tlv320aic23b_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tvmixer.c
--- a/linux/drivers/media/video/tvmixer.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tvmixer.c Sun Feb 01 10:24:06 2009 -0200
@@ -223,7 +223,6 @@ static struct i2c_driver driver = {
.driver = {
.name = "tvmixer",
},
- .id = I2C_DRIVERID_TVMIXER,
#ifndef I2C_DF_DUMMY
.detach_adapter = tvmixer_adapters,
#endif
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/tvp5150.c
--- a/linux/drivers/media/video/tvp5150.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/tvp5150.c Sun Feb 01 10:24:06 2009 -0200
@@ -1195,7 +1195,6 @@ MODULE_DEVICE_TABLE(i2c, tvp5150_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tvp5150",
- .driverid = I2C_DRIVERID_TVP5150,
.command = tvp5150_command,
.probe = tvp5150_probe,
.remove = tvp5150_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/upd64031a.c
--- a/linux/drivers/media/video/upd64031a.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/upd64031a.c Sun Feb 01 10:24:06 2009 -0200
@@ -275,7 +275,6 @@ MODULE_DEVICE_TABLE(i2c, upd64031a_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "upd64031a",
- .driverid = I2C_DRIVERID_UPD64031A,
.command = upd64031a_command,
.probe = upd64031a_probe,
.remove = upd64031a_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/upd64083.c
--- a/linux/drivers/media/video/upd64083.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/upd64083.c Sun Feb 01 10:24:06 2009 -0200
@@ -247,7 +247,6 @@ MODULE_DEVICE_TABLE(i2c, upd64083_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "upd64083",
- .driverid = I2C_DRIVERID_UPD64083,
.command = upd64083_command,
.probe = upd64083_probe,
.remove = upd64083_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/vp27smpx.c
--- a/linux/drivers/media/video/vp27smpx.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/vp27smpx.c Sun Feb 01 10:24:06 2009 -0200
@@ -217,7 +217,6 @@ MODULE_DEVICE_TABLE(i2c, vp27smpx_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "vp27smpx",
- .driverid = I2C_DRIVERID_VP27SMPX,
.command = vp27smpx_command,
.probe = vp27smpx_probe,
.remove = vp27smpx_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/wm8739.c
--- a/linux/drivers/media/video/wm8739.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/wm8739.c Sun Feb 01 10:24:06 2009 -0200
@@ -351,7 +351,6 @@ MODULE_DEVICE_TABLE(i2c, wm8739_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "wm8739",
- .driverid = I2C_DRIVERID_WM8739,
.command = wm8739_command,
.probe = wm8739_probe,
.remove = wm8739_remove,
diff -r 138cb0226301 -r afc6afc946c7 v4l/versions.txt
--- a/v4l/versions.txt Sat Jan 31 09:14:24 2009 -0200
+++ b/v4l/versions.txt Sun Feb 01 10:24:06 2009 -0200
@@ -1,5 +1,9 @@
# Use this for stuff for drivers that don't compile
[2.6.99]
+
+[2.6.29]
+# Needs defines that are only available from 2.6.29
+VIDEO_PXA27x
[2.6.28]
USB_STV06XX
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/afc6afc946c76edddf2533dff3bfa96c841e1c78
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
