rpms/kernel/devel kernel.spec, 1.1480, 1.1481 linux-2.6-v4l-dvb-experimental.patch, 1.6, 1.7 linux-2.6-v4l-dvb-fixes.patch, 1.10, 1.11
Mauro Carvalho Chehab
mchehab at fedoraproject.org
Mon Mar 30 04:11:08 UTC 2009
Author: mchehab
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26221
Modified Files:
kernel.spec linux-2.6-v4l-dvb-experimental.patch
linux-2.6-v4l-dvb-fixes.patch
Log Message:
Several V4L/DVB updates for 2.6.30.
Most patches are due to v4l2 sudev conversion for cx88, cx23885,
cafe_ccic and bttv.
In the past, the order of module loading could affect the behaviour of
the driver, especially on devices with i2c gates inside.
After those changes, this random behaviour that happens with some boards
will stop happening. The board will work or won't work.
Although tested, this conversion may cause some regressions, so we need
some soaping here with different hardware.
This is the relation of the applied upstream patches:
V4L/DVB (11248): Remove debug output from stb6100_cfg.h
V4L/DVB (11250): cx231xx: Fix Kconfig help items
V4L/DVB (11251): tuner: prevent invalid initialization of t->config in set_type
V4L/DVB (11253): saa7134: fix RTD Embedded Technologies VFG7350 support.
V4L/DVB (11254): cs53l32a: remove legacy support.
V4L/DVB (11255): dst_ca: fix compile warning.
V4L/DVB (11256): dabusb: fix compile warning.
V4L/DVB (11260): v4l2-ioctl: Check format for S_PARM and G_PARM
V4L/DVB (11261): saa7146: Remove buffer type check from vidioc_g_parm
V4L/DVB (11262): bttv: Remove buffer type check from vidioc_g_parm
V4L/DVB (11263): gspca: Stop setting buffer type, and avoid memset in querycap
V4L/DVB (11264): omap24xxcam: Remove buffer type check from vidioc_s/g_parm
V4L/DVB (11265): stkwebcam: Remove buffer type check from g_parm and q/dq/reqbufs
V4L/DVB (11266): vino: Remove code for things already done by video_ioctl2
V4L/DVB (11267): cafe_ccic: Remove buffer type check from XXXbuf
V4L/DVB (11268): cx23885-417: Don't need to zero ioctl parameter fields
V4L/DVB (11269): cx88-blackbird: Stop setting buffer type in XXX_fmt_vid_cap
V4L/DVB (11270): meye: Remove buffer type checks from XXX_fmt_vid_cap, XXXbuf
V4L/DVB (11271): usbvision: Remove buffer type checks from enum_fmt_vid_cap, XXXbuf
V4L/DVB (11272): zr364xx: Remove code for things already done by video_ioctl2
V4L/DVB (11275): tvaudio: fix mute and s/g_tuner handling
V4L/DVB (11276): tvaudio: add tda9875 support.
V4L/DVB (11277): tvaudio: always call init_timer to prevent rmmod crash.
V4L/DVB (11278): bttv: convert to v4l2_subdev since i2c autoprobing will disappear.
V4L/DVB (11279): bttv: tda9875 is no longer used by bttv, so remove from bt8xx/Kconfig.
V4L/DVB (11281): bttv: move saa6588 config to the helper chip config
V4L/DVB (11282): saa7134: add RDS support.
V4L/DVB (11283): saa6588: remove legacy code.
V4L/DVB (11284): Fix i2c code of flexcop-driver for rare revisions
V4L/DVB (11285): Remove unecessary udelay
V4L/DVB (11287): Code cleanup (passes checkpatch now) of the b2c2-flexcop-drivers 1/2
V4L/DVB (11288): Code cleanup (passes checkpatch now) of the b2c2-flexcop-drivers 2/2
V4L/DVB (11289): Patch for Yuan MC770 DVB-T (1164:0871)
V4L/DVB (11290): Add Elgato EyeTV DTT to dibcom driver
V4L/DVB (11292): uvcvideo: Add support for Syntek cameras found in JAOtech Smart Terminals
V4L/DVB (11293): uvcvideo: Add zero fill for VIDIOC_ENUM_FMT
V4L/DVB (11295): cx23885: convert to v4l2_device.
V4L/DVB (11296): cx23885: bugfix error message if firmware is not found
V4L/DVB (11297): cx23885: convert to v4l2_subdev.
V4L/DVB (11298): cx25840: remove legacy code for old-style i2c API
V4L/DVB (11300): cx88: convert to v4l2_subdev.
V4L/DVB (11301): wm8775: remove legacy code for old-style i2c API
V4L/DVB (11302): tda9875: remove legacy code for old-style i2c API
V4L/DVB (11303): tda7432: remove legacy code for old-style i2c API
V4L/DVB (11304): v4l2: remove v4l2_subdev_command calls where they are no longer needed.
V4L/DVB (11305): cx88: prevent probing rtc and ir devices
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1480
retrieving revision 1.1481
diff -u -r1.1480 -r1.1481
--- kernel.spec 29 Mar 2009 23:03:48 -0000 1.1480
+++ kernel.spec 30 Mar 2009 04:10:35 -0000 1.1481
@@ -1841,6 +1841,9 @@
# and build.
%changelog
+* Sun Mar 29 2009 Mauro Carvalho Chehab <mchehab at redhat.com>
+- more v4l/dvb updates: v4l subdev conversion and some driver improvements
+
* Sun Mar 29 2009 Chuck Ebbert <cebbert at redhat.com>
- More fixes for ALSA hardware pointer updating.
linux-2.6-v4l-dvb-experimental.patch:
Index: linux-2.6-v4l-dvb-experimental.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-experimental.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-v4l-dvb-experimental.patch 28 Mar 2009 12:52:32 -0000 1.6
+++ linux-2.6-v4l-dvb-experimental.patch 30 Mar 2009 04:10:36 -0000 1.7
@@ -2,7 +2,7 @@
V4L/DVB (10982): cx231xx: fix compile warning
V4L/DVB (10989): cx25840: cx23885 detection was broken
-Mauro Carvalho Chehab (11):
+Mauro Carvalho Chehab (12):
V4L/DVB (10953): cx25840: Fix CodingStyle errors introduced by the last patch
V4L/DVB (10955): cx231xx: CodingStyle automatic fixes with Lindent
V4L/DVB (10956): cx231xx: First series of manual CodingStyle fixes
@@ -13,6 +13,7 @@
V4L/DVB (11133): cx231xx: don't print pcb config debug messages by default
V4L/DVB (11134): cx231xx: dmesg cleanup
V4L/DVB (11135): cx231xx: use usb_make_path() for bus_info
+ V4L/DVB (11250): cx231xx: Fix Kconfig help items
Merge branch 'next' of ../pending into Fedora
Sri Deevi (7):
@@ -391,10 +392,10 @@
+MODULE_AUTHOR("Pierre Ossman");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 3f85b9e..114bf04 100644
+index 76bad58..58abbe3 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
-@@ -793,6 +793,8 @@ source "drivers/media/video/hdpvr/Kconfig"
+@@ -795,6 +795,8 @@ source "drivers/media/video/hdpvr/Kconfig"
source "drivers/media/video/em28xx/Kconfig"
@@ -417,7 +418,7 @@
obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o
diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
new file mode 100644
-index 0000000..7a6700f
+index 0000000..9115654
--- /dev/null
+++ b/drivers/media/video/cx231xx/Kconfig
@@ -0,0 +1,35 @@
@@ -431,11 +432,11 @@
+ select VIDEO_CX25840
+ select VIDEO_CX231XX_ALSA
+
-+ ---help---
-+ This is a video4linux driver for Conexant 231xx USB based TV cards.
++ ---help---
++ This is a video4linux driver for Conexant 231xx USB based TV cards.
+
-+ To compile this driver as a module, choose M here: the
-+ module will be called cx231xx
++ To compile this driver as a module, choose M here: the
++ module will be called cx231xx
+
+config VIDEO_CX231XX_ALSA
+ tristate "Conexant Cx231xx ALSA audio module"
@@ -14419,10 +14420,10 @@
static int get_volume(struct i2c_client *client)
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
-index 4a5d5ef..4c3135f 100644
+index a9b8e52..5884daf 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
-@@ -348,6 +348,77 @@ static void cx23885_initialize(struct i2c_client *client)
+@@ -345,6 +345,77 @@ static void cx23885_initialize(struct i2c_client *client)
/* ----------------------------------------------------------------------- */
@@ -14500,7 +14501,7 @@
void cx25840_std_setup(struct i2c_client *client)
{
struct cx25840_state *state = to_state(i2c_get_clientdata(client));
-@@ -417,39 +488,41 @@ void cx25840_std_setup(struct i2c_client *client)
+@@ -414,39 +485,41 @@ void cx25840_std_setup(struct i2c_client *client)
}
/* DEBUG: Displays configured PLL frequency */
@@ -14574,7 +14575,7 @@
}
/* Sets horizontal blanking delay and active lines */
-@@ -599,7 +672,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
+@@ -596,7 +669,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
* configuration in reg (for the cx23885) so we have no
* need to attempt to flip bits for earlier av decoders.
*/
@@ -14583,7 +14584,7 @@
switch (aud_input) {
case CX25840_AUDIO_SERIAL:
/* do nothing, use serial audio input */
-@@ -622,7 +695,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
+@@ -619,7 +692,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
/* Set INPUT_MODE to Composite (0) or S-Video (1) */
cx25840_and_or(client, 0x401, ~0x6, is_composite ? 0 : 0x02);
@@ -14592,7 +14593,7 @@
/* Set CH_SEL_ADC2 to 1 if input comes from CH3 */
cx25840_and_or(client, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0);
/* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2&CH3 */
-@@ -662,6 +735,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
+@@ -659,6 +732,19 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
*/
cx25840_write(client, 0x918, 0xa0);
cx25840_write(client, 0x919, 0x01);
@@ -14612,7 +14613,7 @@
}
return 0;
-@@ -1123,6 +1209,8 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val)
+@@ -1120,6 +1206,8 @@ static int cx25840_init(struct v4l2_subdev *sd, u32 val)
cx25836_initialize(client);
else if (state->is_cx23885)
cx23885_initialize(client);
@@ -14621,7 +14622,7 @@
else
cx25840_initialize(client);
}
-@@ -1178,7 +1266,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
+@@ -1175,7 +1263,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
v4l_dbg(1, cx25840_debug, client, "%s output\n",
enable ? "enable" : "disable");
if (enable) {
@@ -14630,7 +14631,7 @@
u8 v = (cx25840_read(client, 0x421) | 0x0b);
cx25840_write(client, 0x421, v);
} else {
-@@ -1188,7 +1276,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
+@@ -1185,7 +1273,7 @@ static int cx25840_s_stream(struct v4l2_subdev *sd, int enable)
state->is_cx25836 ? 0x04 : 0x07);
}
} else {
@@ -14639,7 +14640,7 @@
u8 v = cx25840_read(client, 0x421) & ~(0x0b);
cx25840_write(client, 0x421, v);
} else {
-@@ -1369,6 +1457,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val)
+@@ -1366,6 +1454,8 @@ static int cx25840_reset(struct v4l2_subdev *sd, u32 val)
cx25836_initialize(client);
else if (state->is_cx23885)
cx23885_initialize(client);
@@ -14648,7 +14649,7 @@
else
cx25840_initialize(client);
return 0;
-@@ -1481,6 +1571,8 @@ static int cx25840_probe(struct i2c_client *client,
+@@ -1465,6 +1555,8 @@ static int cx25840_probe(struct i2c_client *client,
id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
} else if (device_id == 0x1313) {
id = V4L2_IDENT_CX25836 + ((device_id >> 4) & 0xf) - 6;
@@ -14657,7 +14658,7 @@
}
else {
v4l_dbg(1, cx25840_debug, client, "cx25840 not found\n");
-@@ -1503,6 +1595,7 @@ static int cx25840_probe(struct i2c_client *client,
+@@ -1487,6 +1579,7 @@ static int cx25840_probe(struct i2c_client *client,
state->c = client;
state->is_cx25836 = ((device_id & 0xff00) == 0x8300);
state->is_cx23885 = (device_id == 0x0000) || (device_id == 0x1313);
linux-2.6-v4l-dvb-fixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 linux-2.6-v4l-dvb-fixes.patch
Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-v4l-dvb-fixes.patch 28 Mar 2009 12:52:33 -0000 1.10
+++ linux-2.6-v4l-dvb-fixes.patch 30 Mar 2009 04:10:36 -0000 1.11
@@ -98,6 +98,9 @@
Arne Luehrs (1):
V4L/DVB (10319): dib0700: enable IR receiver in Nova TD usb stick (52009)
+Artem Makhutov (1):
+ V4L/DVB (11248): Remove debug output from stb6100_cfg.h
+
Bruno Christo (1):
V4L/DVB (10827): Add support for GeoVision GV-800(S)
@@ -179,7 +182,7 @@
V4L/DVB (11026): sh-mobile-ceu-camera: set field to the value, configured at open()
V4L/DVB (11027): soc-camera: configure drivers with a default format at probe time
-Hans Verkuil (142):
+Hans Verkuil (163):
V4L/DVB (10231): v4l2-subdev: add v4l2_ext_controls support
V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy
V4L/DVB (10246): saa6752hs: convert to v4l2_subdev.
@@ -322,6 +325,27 @@
V4L/DVB (11117): ov7670: add support to get/set registers
V4L/DVB (11118): cafe_ccic: replace debugfs with g/s_register ioctls.
V4L/DVB (11120): cafe_ccic: stick in a comment with a request for test results
+ V4L/DVB (11253): saa7134: fix RTD Embedded Technologies VFG7350 support.
+ V4L/DVB (11254): cs53l32a: remove legacy support.
+ V4L/DVB (11255): dst_ca: fix compile warning.
+ V4L/DVB (11256): dabusb: fix compile warning.
+ V4L/DVB (11275): tvaudio: fix mute and s/g_tuner handling
+ V4L/DVB (11276): tvaudio: add tda9875 support.
+ V4L/DVB (11277): tvaudio: always call init_timer to prevent rmmod crash.
+ V4L/DVB (11278): bttv: convert to v4l2_subdev since i2c autoprobing will disappear.
+ V4L/DVB (11279): bttv: tda9875 is no longer used by bttv, so remove from bt8xx/Kconfig.
+ V4L/DVB (11281): bttv: move saa6588 config to the helper chip config
+ V4L/DVB (11282): saa7134: add RDS support.
+ V4L/DVB (11283): saa6588: remove legacy code.
+ V4L/DVB (11295): cx23885: convert to v4l2_device.
+ V4L/DVB (11297): cx23885: convert to v4l2_subdev.
+ V4L/DVB (11298): cx25840: remove legacy code for old-style i2c API
+ V4L/DVB (11300): cx88: convert to v4l2_subdev.
+ V4L/DVB (11301): wm8775: remove legacy code for old-style i2c API
+ V4L/DVB (11302): tda9875: remove legacy code for old-style i2c API
+ V4L/DVB (11303): tda7432: remove legacy code for old-style i2c API
+ V4L/DVB (11304): v4l2: remove v4l2_subdev_command calls where they are no longer needed.
+ V4L/DVB (11305): cx88: prevent probing rtc and ir devices
Hans Werner (1):
V4L/DVB (10392): lnbp21: documentation about the system register
@@ -466,6 +490,9 @@
Kay Sievers (1):
V4L/DVB (10395): struct device - replace bus_id with dev_name(), dev_set_name()
+Klaus Flittner (1):
+ V4L/DVB (11290): Add Elgato EyeTV DTT to dibcom driver
+
Kuninori Morimoto (8):
V4L/DVB (10616): tw9910: color format check is added on set_fmt
V4L/DVB (10666): ov772x: move configuration from start_capture() to set_fmt()
@@ -481,7 +508,7 @@
V4L/DVB (10366): gspca - mr97310a: New subdriver.
V4L/DVB (10369): gspca - mr97310a: Fix camera initialization copy/paste bugs.
-Laurent Pinchart (7):
+Laurent Pinchart (8):
V4L/DVB (10293): uvcvideo: replace strn{cpy,cat} with strl{cpy,cat}.
V4L/DVB (10294): uvcvideo: Add support for the Alcor Micro AU3820 chipset.
V4L/DVB (10295): uvcvideo: Retry URB buffers allocation when the system is low on memory.
@@ -489,6 +516,7 @@
V4L/DVB (10650): uvcvideo: Initialize streaming parameters with the probe control value
V4L/DVB (10651): uvcvideo: Ignore empty bulk URBs
V4L/DVB (10652): uvcvideo: Add quirk to override wrong bandwidth value for Vimicro devices
+ V4L/DVB (11292): uvcvideo: Add support for Syntek cameras found in JAOtech Smart Terminals
Lierdakil (1):
V4L/DVB (10388): gspca - pac207: Webcam 093a:2474 added.
@@ -556,7 +584,7 @@
V4L/DVB (11226): avoid warnings for request_ihex_firmware on dabusb and vicam
V4L/DVB (11227): ce6230: avoid using unitialized var
-Michael Krufky (35):
+Michael Krufky (36):
V4L/DVB (10415): dib0700: add data debug to dib0700_i2c_xfer_new
V4L/DVB (10416): tveeprom: update to include Hauppauge tuners 151-155
V4L/DVB (10417): sms1xxx: add missing usb id 2040:2011
@@ -592,6 +620,7 @@
V4L/DVB (10969): lgdt3305: add missing space in comment
V4L/DVB (10970): lgdt3305: add MODULE_VERSION
V4L/DVB (10984): lgdt3305: avoid OOPS in error path of lgdt3305_attach
+ V4L/DVB (11251): tuner: prevent invalid initialization of t->config in set_type
Mike Isely (62):
V4L/DVB (10236): pvrusb2: Stop advertising VBI capability - it isn't there
@@ -657,8 +686,9 @@
V4L/DVB (11207): pvrusb2: Add composite and s-video input support for OnAir devices
V4L/DVB (11208): pvrusb2: Use v4l2_device_disconnect()
-Márton Németh (1):
+Márton Németh (2):
V4L/DVB (10633): DAB: fix typo
+ V4L/DVB (11293): uvcvideo: Add zero fill for VIDIOC_ENUM_FMT
Nam Phạm Thà nh (1):
V4L/DVB (10242): pwc: add support for webcam snapshot button
@@ -676,6 +706,10 @@
Pascal Terjan (1):
V4L/DVB (10825): Add ids for Yuan PD378S DVB adapter
+Patrick Boettcher (2):
+ V4L/DVB (11284): Fix i2c code of flexcop-driver for rare revisions
+ V4L/DVB (11285): Remove unecessary udelay
+
Philippe Rétornaz (1):
V4L/DVB (11035): mt9t031 bugfix
@@ -720,6 +754,9 @@
Stephan Wienczny (1):
V4L/DVB (10949): Add support for Terratec Cinergy HT PCI MKII
+Steven Toth (1):
+ V4L/DVB (11296): cx23885: bugfix error message if firmware is not found
+
Stoyan Gaydarov (1):
V4L/DVB (11235): changed ioctls to unlocked
@@ -745,7 +782,7 @@
V4L/DVB (10531): Code rearrangements in preparation for other report types
V4L/DVB (10534): Output HW/SW version from scratchpad
-Trent Piepho (28):
+Trent Piepho (41):
V4L/DVB (10558): bttv: norm value should be unsigned
V4L/DVB (10559): bttv: Fix TDA9880 norm setting code
V4L/DVB (10560): bttv: make tuner card info more consistent
@@ -774,14 +811,34 @@
V4L/DVB (10930): zoran: Unify buffer descriptors
V4L/DVB (10933): zoran: Pass zoran_fh pointers instead of file pointers
V4L/DVB (10934): zoran: replace functions names in strings with __func__
+ V4L/DVB (11260): v4l2-ioctl: Check format for S_PARM and G_PARM
+ V4L/DVB (11261): saa7146: Remove buffer type check from vidioc_g_parm
+ V4L/DVB (11262): bttv: Remove buffer type check from vidioc_g_parm
+ V4L/DVB (11263): gspca: Stop setting buffer type, and avoid memset in querycap
+ V4L/DVB (11264): omap24xxcam: Remove buffer type check from vidioc_s/g_parm
+ V4L/DVB (11265): stkwebcam: Remove buffer type check from g_parm and q/dq/reqbufs
+ V4L/DVB (11266): vino: Remove code for things already done by video_ioctl2
+ V4L/DVB (11267): cafe_ccic: Remove buffer type check from XXXbuf
+ V4L/DVB (11268): cx23885-417: Don't need to zero ioctl parameter fields
+ V4L/DVB (11269): cx88-blackbird: Stop setting buffer type in XXX_fmt_vid_cap
+ V4L/DVB (11270): meye: Remove buffer type checks from XXX_fmt_vid_cap, XXXbuf
+ V4L/DVB (11271): usbvision: Remove buffer type checks from enum_fmt_vid_cap, XXXbuf
+ V4L/DVB (11272): zr364xx: Remove code for things already done by video_ioctl2
Uri Shkolnik (2):
V4L/DVB (10748): sms1xxx: restore smsusb_driver.name to smsusb
V4L/DVB (10750): import changes from Siano
+Uwe Bugla (2):
+ V4L/DVB (11287): Code cleanup (passes checkpatch now) of the b2c2-flexcop-drivers 1/2
+ V4L/DVB (11288): Code cleanup (passes checkpatch now) of the b2c2-flexcop-drivers 2/2
+
Vitaly Wool (1):
V4L/DVB (10833): em28xx: enable Compro VideoMate ForYou sound
+Xoan Loureiro (1):
+ V4L/DVB (11289): Patch for Yuan MC770 DVB-T (1164:0871)
+
klaas de waal (1):
V4L/DVB (11236): tda827x: fix locking issues with DVB-C
@@ -2096,7 +2153,7 @@
i2c_adapter->algo = &saa7146_algo;
i2c_adapter->algo_data = NULL;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
-index 47fee05..8035285 100644
+index 47fee05..552dab4 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1,4 +1,5 @@
@@ -2523,7 +2580,7 @@
/********************************************************************************/
/* common pagetable functions */
-@@ -829,231 +497,448 @@ static int video_end(struct saa7146_fh *fh, struct file *file)
+@@ -829,231 +497,446 @@ static int video_end(struct saa7146_fh *fh, struct file *file)
return 0;
}
@@ -2705,7 +2762,11 @@
- /* fixme: add handle "after" case (is it still needed?) */
+ mutex_lock(&dev->lock);
-+
+
+- switch (fh->type) {
[...9792 lines suppressed...]
if (ret < 0) {
printk(KERN_ERR "VINO channel A Video4Linux-device "
-@@ -4619,7 +4388,7 @@ static int __init vino_module_init(void)
+@@ -4619,7 +4326,7 @@ static int __init vino_module_init(void)
}
vino_init_stage++;
@@ -95086,7 +100544,7 @@
VFL_TYPE_GRABBER, -1);
if (ret < 0) {
printk(KERN_ERR "VINO channel B Video4Linux-device "
-@@ -4629,10 +4398,12 @@ static int __init vino_module_init(void)
+@@ -4629,10 +4336,12 @@ static int __init vino_module_init(void)
}
vino_init_stage++;
@@ -95885,17 +101343,30 @@
-module_param(vid_limit, int, 0644);
-MODULE_PARM_DESC(vid_limit, "capture memory limit in megabytes");
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
-index 5d73f66..9a590a9 100644
+index 5d73f66..42e23a4 100644
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
-@@ -206,7 +206,6 @@ MODULE_DEVICE_TABLE(i2c, vp27smpx_id);
+@@ -129,11 +129,6 @@ static int vp27smpx_log_status(struct v4l2_subdev *sd)
+ return 0;
+ }
+
+-static int vp27smpx_command(struct i2c_client *client, unsigned cmd, void *arg)
+-{
+- return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
+-}
+-
+ /* ----------------------------------------------------------------------- */
+
+ static const struct v4l2_subdev_core_ops vp27smpx_core_ops = {
+@@ -206,8 +201,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,
+- .command = vp27smpx_command,
.probe = vp27smpx_probe,
.remove = vp27smpx_remove,
+ .id_table = vp27smpx_id,
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 67aa0db..0cc2353 100644
--- a/drivers/media/video/vpx3220.c
@@ -97026,17 +102497,72 @@
#undef PDBGG
#define PDBGG(fmt, args...) do {;} while(0); /* nothing: it's a placeholder */
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
-index f2864d5..18535c4 100644
+index f2864d5..b572ce2 100644
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
-@@ -343,7 +343,6 @@ MODULE_DEVICE_TABLE(i2c, wm8739_id);
+@@ -252,11 +252,6 @@ static int wm8739_log_status(struct v4l2_subdev *sd)
+ return 0;
+ }
+
+-static int wm8739_command(struct i2c_client *client, unsigned cmd, void *arg)
+-{
+- return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
+-}
+-
+ /* ----------------------------------------------------------------------- */
+
+ static const struct v4l2_subdev_core_ops wm8739_core_ops = {
+@@ -343,8 +338,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,
+- .command = wm8739_command,
.probe = wm8739_probe,
.remove = wm8739_remove,
+ .id_table = wm8739_id,
+diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
+index 53fcd42..eddf11a 100644
+--- a/drivers/media/video/wm8775.c
++++ b/drivers/media/video/wm8775.c
+@@ -34,15 +34,12 @@
+ #include <linux/videodev2.h>
+ #include <media/v4l2-device.h>
+ #include <media/v4l2-chip-ident.h>
+-#include <media/v4l2-i2c-drv-legacy.h>
++#include <media/v4l2-i2c-drv.h>
+
+ MODULE_DESCRIPTION("wm8775 driver");
+ MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
+ MODULE_LICENSE("GPL");
+
+-static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END };
+-
+-I2C_CLIENT_INSMOD;
+
+
+ /* ----------------------------------------------------------------------- */
+@@ -161,11 +158,6 @@ static int wm8775_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *fre
+ return 0;
+ }
+
+-static int wm8775_command(struct i2c_client *client, unsigned cmd, void *arg)
+-{
+- return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
+-}
+-
+ /* ----------------------------------------------------------------------- */
+
+ static const struct v4l2_subdev_core_ops wm8775_core_ops = {
+@@ -268,8 +260,6 @@ MODULE_DEVICE_TABLE(i2c, wm8775_id);
+
+ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+ .name = "wm8775",
+- .driverid = I2C_DRIVERID_WM8775,
+- .command = wm8775_command,
+ .probe = wm8775_probe,
+ .remove = wm8775_remove,
+ .id_table = wm8775_id,
diff --git a/drivers/media/video/zc0301/zc0301_sensor.h b/drivers/media/video/zc0301/zc0301_sensor.h
index b0cd49c..3a408de 100644
--- a/drivers/media/video/zc0301/zc0301_sensor.h
@@ -104941,7 +110467,7 @@
/* headerfile of this module */
#include "zr36060.h"
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
-index 9302356..f2f8cdd 100644
+index 9302356..221409f 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -96,6 +96,7 @@ static struct usb_device_id device_table[] = {
@@ -104952,6 +110478,64 @@
{} /* Terminating entry */
};
+@@ -425,7 +426,6 @@ static ssize_t zr364xx_read(struct file *file, char __user *buf, size_t cnt,
+ static int zr364xx_vidioc_querycap(struct file *file, void *priv,
+ struct v4l2_capability *cap)
+ {
+- memset(cap, 0, sizeof(*cap));
+ strcpy(cap->driver, DRIVER_DESC);
+ cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE;
+ return 0;
+@@ -436,8 +436,6 @@ static int zr364xx_vidioc_enum_input(struct file *file, void *priv,
+ {
+ if (i->index != 0)
+ return -EINVAL;
+- memset(i, 0, sizeof(*i));
+- i->index = 0;
+ strcpy(i->name, DRIVER_DESC " Camera");
+ i->type = V4L2_INPUT_TYPE_CAMERA;
+ return 0;
+@@ -529,11 +527,6 @@ static int zr364xx_vidioc_enum_fmt_vid_cap(struct file *file,
+ {
+ if (f->index > 0)
+ return -EINVAL;
+- if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+- return -EINVAL;
+- memset(f, 0, sizeof(*f));
+- f->index = 0;
+- f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ f->flags = V4L2_FMT_FLAG_COMPRESSED;
+ strcpy(f->description, "JPEG");
+ f->pixelformat = V4L2_PIX_FMT_JPEG;
+@@ -550,8 +543,6 @@ static int zr364xx_vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+ return -ENODEV;
+ cam = video_get_drvdata(vdev);
+
+- if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+- return -EINVAL;
+ if (f->fmt.pix.pixelformat != V4L2_PIX_FMT_JPEG)
+ return -EINVAL;
+ if (f->fmt.pix.field != V4L2_FIELD_ANY &&
+@@ -577,10 +568,6 @@ static int zr364xx_vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+ return -ENODEV;
+ cam = video_get_drvdata(vdev);
+
+- if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+- return -EINVAL;
+- memset(&f->fmt.pix, 0, sizeof(struct v4l2_pix_format));
+- f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ f->fmt.pix.pixelformat = V4L2_PIX_FMT_JPEG;
+ f->fmt.pix.field = V4L2_FIELD_NONE;
+ f->fmt.pix.width = cam->width;
+@@ -602,8 +589,6 @@ static int zr364xx_vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+ return -ENODEV;
+ cam = video_get_drvdata(vdev);
+
+- if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+- return -EINVAL;
+ if (f->fmt.pix.pixelformat != V4L2_PIX_FMT_JPEG)
+ return -EINVAL;
+ if (f->fmt.pix.field != V4L2_FIELD_ANY &&
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 106c3ba..5bd3efd 100644
--- a/include/linux/Kbuild
More information about the fedora-extras-commits
mailing list