git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
media
/
video
/
em28xx
/
em28xx-video.c
diff --git
a/drivers/media/video/em28xx/em28xx-video.c
b/drivers/media/video/em28xx/em28xx-video.c
index
2a461dd
..
cf7cdf9
100644
(file)
--- a/
drivers/media/video/em28xx/em28xx-video.c
+++ b/
drivers/media/video/em28xx/em28xx-video.c
@@
-3,7
+3,7
@@
Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
Markus Rechberger <mrechberger@gmail.com>
Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
Markus Rechberger <mrechberger@gmail.com>
- Mauro Carvalho Chehab <mchehab@
infradead.org
>
+ Mauro Carvalho Chehab <mchehab@
brturbo.com.br
>
Sascha Sommer <saschasommer@freenet.de>
Some parts based on SN9C10x PC Camera Controllers GPL driver made
Sascha Sommer <saschasommer@freenet.de>
Some parts based on SN9C10x PC Camera Controllers GPL driver made
@@
-42,7
+42,7
@@
#define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
"Markus Rechberger <mrechberger@gmail.com>, " \
#define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
"Markus Rechberger <mrechberger@gmail.com>, " \
- "Mauro Carvalho Chehab <mchehab@
infradead.org
>, " \
+ "Mauro Carvalho Chehab <mchehab@
brturbo.com.br
>, " \
"Sascha Sommer <saschasommer@freenet.de>"
#define DRIVER_NAME "em28xx"
"Sascha Sommer <saschasommer@freenet.de>"
#define DRIVER_NAME "em28xx"
@@
-170,12
+170,8
@@
static int em28xx_config(struct em28xx *dev)
static void em28xx_config_i2c(struct em28xx *dev)
{
struct v4l2_frequency f;
static void em28xx_config_i2c(struct em28xx *dev)
{
struct v4l2_frequency f;
- struct v4l2_routing route;
-
- route.input = INPUT(dev->ctl_input)->vmux;
- route.output = 0;
em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);
em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);
- em28xx_i2c_call_clients(dev, VIDIOC_
INT_S_VIDEO_ROUTING, &route
);
+ em28xx_i2c_call_clients(dev, VIDIOC_
S_INPUT, &dev->ctl_input
);
em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
/* configure tuner */
em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
/* configure tuner */
@@
-210,19
+206,19
@@
static void em28xx_empty_framequeues(struct em28xx *dev)
static void video_mux(struct em28xx *dev, int index)
{
static void video_mux(struct em28xx *dev, int index)
{
- int ainput;
- struct v4l2_routing route;
+ int input, ainput;
- route.input = INPUT(index)->vmux;
- route.output = 0;
+ input = INPUT(index)->vmux;
dev->ctl_input = index;
dev->ctl_ainput = INPUT(index)->amux;
dev->ctl_input = index;
dev->ctl_ainput = INPUT(index)->amux;
- em28xx_i2c_call_clients(dev, VIDIOC_
INT_S_VIDEO_ROUTING, &route
);
+ em28xx_i2c_call_clients(dev, VIDIOC_
S_INPUT, &input
);
- em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,
route.
input,dev->ctl_ainput);
+ em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev->ctl_ainput);
if (dev->has_msp34xx) {
if (dev->has_msp34xx) {
+ struct v4l2_routing route;
+
if (dev->i2s_speed)
em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
route.input = dev->ctl_ainput;
if (dev->i2s_speed)
em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
route.input = dev->ctl_ainput;
@@
-1574,6
+1570,8
@@
static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
request_module("tvp5150");
if (dev->has_tuner)
request_module("tuner");
request_module("tvp5150");
if (dev->has_tuner)
request_module("tuner");
+ if (dev->tda9887_conf)
+ request_module("tda9887");
#endif
errCode = em28xx_config(dev);
if (errCode) {
#endif
errCode = em28xx_config(dev);
if (errCode) {