Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330711
b: refs/heads/master
c: 364d2db
h: refs/heads/master
i:
  330709: 8ff9982
  330707: 7692882
  330703: 6bd7b40
v: v3
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Aug 9, 2012
1 parent f930048 commit a21956b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 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: 43f2cccfc81c0af719a425ea816ce8003bb09748
refs/heads/master: 364d2db2791aa3a808d2590ef62c53b4a83c25dd
11 changes: 8 additions & 3 deletions trunk/drivers/media/video/au0828/au0828-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1717,8 +1717,12 @@ static int vidioc_g_register(struct file *file, void *priv,
v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg);
return 0;
default:
return -EINVAL;
if (!v4l2_chip_match_host(&reg->match))
return -EINVAL;
}

reg->val = au0828_read(dev, reg->reg);
return 0;
}

static int vidioc_s_register(struct file *file, void *priv,
Expand All @@ -1732,9 +1736,10 @@ static int vidioc_s_register(struct file *file, void *priv,
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg);
return 0;
default:
return -EINVAL;
if (!v4l2_chip_match_host(&reg->match))
return -EINVAL;
}
return 0;
return au0828_writereg(dev, reg->reg, reg->val);
}
#endif

Expand Down

0 comments on commit a21956b

Please sign in to comment.