Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 366851
b: refs/heads/master
c: c7622fc
h: refs/heads/master
i:
  366849: 284fcab
  366847: bed8d79
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Mar 25, 2013
1 parent ea50912 commit fa2a94a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79b0c6400517456935f84f8d46c8bb0cf73f1813
refs/heads/master: c7622fc9483f57f0dd77ad50e104b7e53d6b365d
7 changes: 1 addition & 6 deletions trunk/drivers/media/usb/stk1160/stk1160-v4l.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ static int vidioc_g_chip_ident(struct file *file, void *priv,
struct v4l2_dbg_chip_ident *chip)
{
switch (chip->match.type) {
case V4L2_CHIP_MATCH_HOST:
case V4L2_CHIP_MATCH_BRIDGE:
chip->ident = V4L2_IDENT_NONE;
chip->revision = 0;
return 0;
Expand All @@ -476,9 +476,6 @@ static int vidioc_g_register(struct file *file, void *priv,
u8 val;

switch (reg->match.type) {
case V4L2_CHIP_MATCH_AC97:
/* TODO: Support me please :-( */
return -EINVAL;
case V4L2_CHIP_MATCH_I2C_DRIVER:
v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg);
return 0;
Expand All @@ -505,8 +502,6 @@ static int vidioc_s_register(struct file *file, void *priv,
struct stk1160 *dev = video_drvdata(file);

switch (reg->match.type) {
case V4L2_CHIP_MATCH_AC97:
return -EINVAL;
case V4L2_CHIP_MATCH_I2C_DRIVER:
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg);
return 0;
Expand Down

0 comments on commit fa2a94a

Please sign in to comment.