aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tea6420.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-30 20:41:32 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-30 20:41:32 -0500
commitf54a6ec0fd85002d94d05b4bb679508eeb066683 (patch)
tree0f24dd66cce563d2c5e7656c2489e5b96eef31f9 /drivers/media/video/tea6420.c
parent5ed1836814d908f45cafde0e79cb85314ab9d41d (diff)
parent134179823b3ca9c8b98e0631906459dbb022ff9b (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (583 commits) V4L/DVB (10130): use USB API functions rather than constants V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends V4L/DVB (10128): modify V4L documentation to be a valid XHTML V4L/DVB (10127): stv06xx: Avoid having y unitialized V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices V4L/DVB (10124): em28xx: expand output formats available V4L/DVB (10123): em28xx: fix reversed definitions of I2S audio modes V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile V4L/DVB (10119): em28xx: fix corrupted XCLK value V4L/DVB (10118): zoran: fix warning for a variable not used V4L/DVB (10116): af9013: Fix gcc false warnings V4L/DVB (10111a): usbvideo.h: remove an useless blank line V4L/DVB (10111): quickcam_messenger.c: fix a warning V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2 V4L/DVB (10109): anysee: Fix usage of an unitialized function V4L/DVB (10104): uvcvideo: Add support for video output devices V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams. V4L/DVB (10101): uvcvideo: Fix bulk URB processing when the header is erroneous ...
Diffstat (limited to 'drivers/media/video/tea6420.c')
-rw-r--r--drivers/media/video/tea6420.c49
1 files changed, 37 insertions, 12 deletions
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index e50820969e64..38e519f04bde 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -31,7 +31,7 @@
31#include <linux/module.h> 31#include <linux/module.h>
32#include <linux/ioctl.h> 32#include <linux/ioctl.h>
33#include <linux/i2c.h> 33#include <linux/i2c.h>
34#include <media/v4l2-common.h> 34#include <media/v4l2-device.h>
35#include <media/v4l2-i2c-drv-legacy.h> 35#include <media/v4l2-i2c-drv-legacy.h>
36#include "tea6420.h" 36#include "tea6420.h"
37 37
@@ -90,26 +90,37 @@ static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
90 return 0; 90 return 0;
91} 91}
92 92
93static int tea6420_command(struct i2c_client *client, unsigned cmd, void *arg) 93static int tea6420_ioctl(struct v4l2_subdev *sd, unsigned cmd, void *arg)
94{ 94{
95 struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg; 95 if (cmd == TEA6420_SWITCH) {
96 int result = 0; 96 struct i2c_client *client = v4l2_get_subdevdata(sd);
97 struct tea6420_multiplex *a = (struct tea6420_multiplex *)arg;
97 98
98 switch (cmd) { 99 return tea6420_switch(client, a->in, a->out, a->gain);
99 case TEA6420_SWITCH:
100 result = tea6420_switch(client, a->in, a->out, a->gain);
101 break;
102 default:
103 return -ENOIOCTLCMD;
104 } 100 }
101 return -ENOIOCTLCMD;
102}
105 103
106 return result; 104static int tea6420_command(struct i2c_client *client, unsigned cmd, void *arg)
105{
106 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
107} 107}
108 108
109/* ----------------------------------------------------------------------- */
110
111static const struct v4l2_subdev_core_ops tea6420_core_ops = {
112 .ioctl = tea6420_ioctl,
113};
114
115static const struct v4l2_subdev_ops tea6420_ops = {
116 .core = &tea6420_core_ops,
117};
118
109/* this function is called by i2c_probe */ 119/* this function is called by i2c_probe */
110static int tea6420_probe(struct i2c_client *client, 120static int tea6420_probe(struct i2c_client *client,
111 const struct i2c_device_id *id) 121 const struct i2c_device_id *id)
112{ 122{
123 struct v4l2_subdev *sd;
113 int err, i; 124 int err, i;
114 125
115 /* let's see whether this adapter can support what we need */ 126 /* let's see whether this adapter can support what we need */
@@ -126,9 +137,22 @@ static int tea6420_probe(struct i2c_client *client,
126 } 137 }
127 if (err) { 138 if (err) {
128 v4l_dbg(1, debug, client, "could not initialize tea6420\n"); 139 v4l_dbg(1, debug, client, "could not initialize tea6420\n");
129 kfree(client);
130 return -ENODEV; 140 return -ENODEV;
131 } 141 }
142
143 sd = kmalloc(sizeof(struct v4l2_subdev), GFP_KERNEL);
144 if (sd == NULL)
145 return -ENOMEM;
146 v4l2_i2c_subdev_init(sd, client, &tea6420_ops);
147 return 0;
148}
149
150static int tea6420_remove(struct i2c_client *client)
151{
152 struct v4l2_subdev *sd = i2c_get_clientdata(client);
153
154 v4l2_device_unregister_subdev(sd);
155 kfree(sd);
132 return 0; 156 return 0;
133} 157}
134 158
@@ -150,6 +174,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
150 .driverid = I2C_DRIVERID_TEA6420, 174 .driverid = I2C_DRIVERID_TEA6420,
151 .command = tea6420_command, 175 .command = tea6420_command,
152 .probe = tea6420_probe, 176 .probe = tea6420_probe,
177 .remove = tea6420_remove,
153 .legacy_probe = tea6420_legacy_probe, 178 .legacy_probe = tea6420_legacy_probe,
154 .id_table = tea6420_id, 179 .id_table = tea6420_id,
155}; 180};