From: Linus Torvalds Date: Fri, 4 Jun 2010 22:38:12 +0000 (-0700) Subject: Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha... X-Git-Tag: v2.6.35-rc2~11 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=e620d1e39aa33b43bed96aa7f2ebbc88914aed58;hp=-c;p=cascardo%2Flinux.git Merge branch 'v4l_for_2.6.35' of git://git./linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (87 commits) V4L/DVB: ivtv: Timing tweaks and code re-order to try and improve stability V4L/DVB: ivtv: Avoid accidental video standard change V4L/DVB: ivtvfb : Module load / unload fixes V4L/DVB: cx2341x: Report correct temporal setting for log-status V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address V4L/DVB: drivers/media: Eliminate a NULL pointer dereference V4L/DVB: dvb-core: Fix ULE decapsulation bug V4L/DVB: Bug fix: make IR work again for dm1105 V4L/DVB: media/IR: nec-decoder needs to select BITREV V4L/DVB: video/saa7134: change dprintk() to i2cdprintk() V4L/DVB: video/saa7134: remove duplicate break V4L/DVB: IR/imon: add auto-config for 0xffdc rf device V4L/DVB: IR/imon: clean up usage of bools V4L/DVB: em28xx: remove unneeded null checks V4L/DVB: ngene: remove unused #include V4L/DVB: ak881x needs slab.h V4L/DVB: FusionHDTV: Use quick reads for I2C IR device probing V4L/DVB: Technotrend S2-3200 ships with a TT 1500 remote V4L/DVB: drivers/media: Use kzalloc V4L/DVB: m920x: Select simple tuner ... --- e620d1e39aa33b43bed96aa7f2ebbc88914aed58 diff --combined MAINTAINERS index a73dd8030afa,0200b63fb448..67accd730ac9 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1731,7 -1731,7 +1731,7 @@@ S: Maintaine F: sound/pci/cs5535audio/ CX18 VIDEO4LINUX DRIVER - M: Andy Walls + M: Andy Walls L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) L: linux-media@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git @@@ -3165,7 -3165,7 +3165,7 @@@ F: Documentation/hwmon/it8 F: drivers/hwmon/it87.c IVTV VIDEO4LINUX DRIVER - M: Andy Walls + M: Andy Walls L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) L: linux-media@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git @@@ -3242,7 -3242,7 +3242,7 @@@ L: autofs@linux.kernel.or S: Maintained F: fs/autofs4/ -KERNEL BUILD +KERNEL BUILD + files below scripts/ (unless maintained elsewhere) M: Michal Marek T: git git://repo.or.cz/linux-kbuild.git for-next T: git git://repo.or.cz/linux-kbuild.git for-linus @@@ -3251,9 -3251,6 +3251,9 @@@ S: Maintaine F: Documentation/kbuild/ F: Makefile F: scripts/Makefile.* +F: scripts/basic/ +F: scripts/mk* +F: scripts/package/ KERNEL JANITORS L: kernel-janitors@vger.kernel.org @@@ -3503,8 -3500,9 +3503,8 @@@ F: arch/powerpc/platforms/83xx LINUX FOR POWERPC PA SEMI PWRFICIENT M: Olof Johansson -W: http://www.pasemi.com/ L: linuxppc-dev@ozlabs.org -S: Supported +S: Maintained F: arch/powerpc/platforms/pasemi/ F: drivers/*/*pasemi* F: drivers/*/*/*pasemi* diff --combined drivers/media/video/mt9m001.c index e3b9a8ab37f4,992ab8cb89ae..79f096ddcf5d --- a/drivers/media/video/mt9m001.c +++ b/drivers/media/video/mt9m001.c @@@ -701,13 -701,13 +701,13 @@@ static struct v4l2_subdev_core_ops mt9m #endif }; - static int mt9m001_enum_fmt(struct v4l2_subdev *sd, int index, + static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { struct i2c_client *client = sd->priv; struct mt9m001 *mt9m001 = to_mt9m001(client); - if ((unsigned int)index >= mt9m001->num_fmts) + if (index >= mt9m001->num_fmts) return -EINVAL; *code = mt9m001->fmts[index].code; @@@ -785,6 -785,7 +785,6 @@@ static int mt9m001_probe(struct i2c_cli ret = mt9m001_video_probe(icd, client); if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(mt9m001); } @@@ -798,6 -799,7 +798,6 @@@ static int mt9m001_remove(struct i2c_cl icd->ops = NULL; mt9m001_video_remove(icd); - i2c_set_clientdata(client, NULL); client->driver = NULL; kfree(mt9m001); diff --combined drivers/media/video/mt9m111.c index e42162c50f0a,bac0c5d4070c..fbd0fc794720 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c @@@ -999,10 -999,10 +999,10 @@@ static struct v4l2_subdev_core_ops mt9m #endif }; - static int mt9m111_enum_fmt(struct v4l2_subdev *sd, int index, + static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { - if ((unsigned int)index >= ARRAY_SIZE(mt9m111_colour_fmts)) + if (index >= ARRAY_SIZE(mt9m111_colour_fmts)) return -EINVAL; *code = mt9m111_colour_fmts[index].code; @@@ -1068,6 -1068,7 +1068,6 @@@ static int mt9m111_probe(struct i2c_cli ret = mt9m111_video_probe(icd, client); if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(mt9m111); } @@@ -1080,6 -1081,7 +1080,6 @@@ static int mt9m111_remove(struct i2c_cl struct soc_camera_device *icd = client->dev.platform_data; icd->ops = NULL; - i2c_set_clientdata(client, NULL); client->driver = NULL; kfree(mt9m111); diff --combined drivers/media/video/mt9t031.c index 9f5ff2547f19,f26933a8fd8a..a9a28b214235 --- a/drivers/media/video/mt9t031.c +++ b/drivers/media/video/mt9t031.c @@@ -798,7 -798,7 +798,7 @@@ static struct v4l2_subdev_core_ops mt9t #endif }; - static int mt9t031_enum_fmt(struct v4l2_subdev *sd, int index, + static int mt9t031_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { if (index) @@@ -883,6 -883,7 +883,6 @@@ static int mt9t031_probe(struct i2c_cli if (ret) { if (icd) icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(mt9t031); } @@@ -896,6 -897,7 +896,6 @@@ static int mt9t031_remove(struct i2c_cl if (icd) icd->ops = NULL; - i2c_set_clientdata(client, NULL); client->driver = NULL; kfree(mt9t031); diff --combined drivers/media/video/mt9t112.c index aa4fce95098f,abe5505b9f79..e4bf1db9a87b --- a/drivers/media/video/mt9t112.c +++ b/drivers/media/video/mt9t112.c @@@ -1017,10 -1017,10 +1017,10 @@@ static int mt9t112_try_fmt(struct v4l2_ return 0; } - static int mt9t112_enum_fmt(struct v4l2_subdev *sd, int index, + static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { - if ((unsigned int)index >= ARRAY_SIZE(mt9t112_cfmts)) + if (index >= ARRAY_SIZE(mt9t112_cfmts)) return -EINVAL; *code = mt9t112_cfmts[index].code; @@@ -1119,6 -1119,7 +1119,6 @@@ static int mt9t112_probe(struct i2c_cli ret = mt9t112_camera_probe(icd, client); if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); } @@@ -1131,6 -1132,7 +1131,6 @@@ static int mt9t112_remove(struct i2c_cl struct soc_camera_device *icd = client->dev.platform_data; icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); return 0; } diff --combined drivers/media/video/mt9v022.c index fb44ff006628,c409d05d465a..e7cd23cd6394 --- a/drivers/media/video/mt9v022.c +++ b/drivers/media/video/mt9v022.c @@@ -838,13 -838,13 +838,13 @@@ static struct v4l2_subdev_core_ops mt9v #endif }; - static int mt9v022_enum_fmt(struct v4l2_subdev *sd, int index, + static int mt9v022_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { struct i2c_client *client = sd->priv; struct mt9v022 *mt9v022 = to_mt9v022(client); - if ((unsigned int)index >= mt9v022->num_fmts) + if (index >= mt9v022->num_fmts) return -EINVAL; *code = mt9v022->fmts[index].code; @@@ -920,6 -920,7 +920,6 @@@ static int mt9v022_probe(struct i2c_cli ret = mt9v022_video_probe(icd, client); if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(mt9v022); } @@@ -933,6 -934,7 +933,6 @@@ static int mt9v022_remove(struct i2c_cl icd->ops = NULL; mt9v022_video_remove(icd); - i2c_set_clientdata(client, NULL); client->driver = NULL; kfree(mt9v022); diff --combined drivers/media/video/ov772x.c index c33acc94b747,86b0186c360c..34034a710214 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c @@@ -1092,10 -1092,10 +1092,10 @@@ static struct v4l2_subdev_core_ops ov77 #endif }; - static int ov772x_enum_fmt(struct v4l2_subdev *sd, int index, + static int ov772x_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { - if ((unsigned int)index >= ARRAY_SIZE(ov772x_cfmts)) + if (index >= ARRAY_SIZE(ov772x_cfmts)) return -EINVAL; *code = ov772x_cfmts[index].code; @@@ -1159,6 -1159,7 +1159,6 @@@ static int ov772x_probe(struct i2c_clie ret = ov772x_video_probe(icd, client); if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); } @@@ -1171,6 -1172,7 +1171,6 @@@ static int ov772x_remove(struct i2c_cli struct soc_camera_device *icd = client->dev.platform_data; icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); return 0; } diff --combined drivers/media/video/ov9640.c index 035e9ecb0c75,58811c044c6a..7ce9e05b4781 --- a/drivers/media/video/ov9640.c +++ b/drivers/media/video/ov9640.c @@@ -614,10 -614,10 +614,10 @@@ static int ov9640_try_fmt(struct v4l2_s return 0; } - static int ov9640_enum_fmt(struct v4l2_subdev *sd, int index, + static int ov9640_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { - if ((unsigned int)index >= ARRAY_SIZE(ov9640_codes)) + if (index >= ARRAY_SIZE(ov9640_codes)) return -EINVAL; *code = ov9640_codes[index]; @@@ -783,6 -783,7 +783,6 @@@ static int ov9640_probe(struct i2c_clie if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); } @@@ -793,6 -794,7 +793,6 @@@ static int ov9640_remove(struct i2c_cli { struct ov9640_priv *priv = i2c_get_clientdata(client); - i2c_set_clientdata(client, NULL); kfree(priv); return 0; } diff --combined drivers/media/video/rj54n1cb0c.c index 2c3b58c99e18,64eb05ce5603..47fd207ba3b1 --- a/drivers/media/video/rj54n1cb0c.c +++ b/drivers/media/video/rj54n1cb0c.c @@@ -481,10 -481,10 +481,10 @@@ static int reg_write_multiple(struct i2 return 0; } - static int rj54n1_enum_fmt(struct v4l2_subdev *sd, int index, + static int rj54n1_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { - if ((unsigned int)index >= ARRAY_SIZE(rj54n1_colour_fmts)) + if (index >= ARRAY_SIZE(rj54n1_colour_fmts)) return -EINVAL; *code = rj54n1_colour_fmts[index].code; @@@ -1444,6 -1444,7 +1444,6 @@@ static int rj54n1_probe(struct i2c_clie ret = rj54n1_video_probe(icd, client, rj54n1_priv); if (ret < 0) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(rj54n1); return ret; } @@@ -1460,6 -1461,7 +1460,6 @@@ static int rj54n1_remove(struct i2c_cli icd->ops = NULL; if (icl->free_bus) icl->free_bus(icl); - i2c_set_clientdata(client, NULL); client->driver = NULL; kfree(rj54n1); diff --combined drivers/media/video/tw9910.c index 6eb3395def07,2f3b1942e027..445dc93413e3 --- a/drivers/media/video/tw9910.c +++ b/drivers/media/video/tw9910.c @@@ -903,7 -903,7 +903,7 @@@ static struct v4l2_subdev_core_ops tw99 #endif }; - static int tw9910_enum_fmt(struct v4l2_subdev *sd, int index, + static int tw9910_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { if (index) @@@ -977,6 -977,7 +977,6 @@@ static int tw9910_probe(struct i2c_clie ret = tw9910_video_probe(icd, client); if (ret) { icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); } @@@ -989,6 -990,7 +989,6 @@@ static int tw9910_remove(struct i2c_cli struct soc_camera_device *icd = client->dev.platform_data; icd->ops = NULL; - i2c_set_clientdata(client, NULL); kfree(priv); return 0; }