Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 13388
b: refs/heads/master
c: 48c4259
h: refs/heads/master
v: v3
  • Loading branch information
Elad Lahav authored and Linus Torvalds committed Nov 9, 2005
1 parent 0c9053d commit 13ad597
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f59ab27b7a6fd760268f695078c739f3036b4edf
refs/heads/master: 48c425965ecbd3472133adb857c2fe0608c053a0
1 change: 1 addition & 0 deletions trunk/drivers/media/video/cx88/cx88-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,

memset(t,0,sizeof(*t));
strcpy(t->name, "Radio");
t->type = V4L2_TUNER_RADIO;

cx88_call_i2c_clients(core,VIDIOC_G_TUNER,t);
return 0;
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/media/video/saa7134/saa7134-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1862,6 +1862,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
break;
if (NULL != card_in(dev,n).name) {
strcpy(t->name, "Television");
t->type = V4L2_TUNER_ANALOG_TV;
t->capability = V4L2_TUNER_CAP_NORM |
V4L2_TUNER_CAP_STEREO |
V4L2_TUNER_CAP_LANG1 |
Expand Down Expand Up @@ -2165,6 +2166,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,

memset(t,0,sizeof(*t));
strcpy(t->name, "Radio");
t->type = V4L2_TUNER_RADIO;

saa7134_i2c_call_clients(dev, VIDIOC_G_TUNER, t);

Expand Down

0 comments on commit 13ad597

Please sign in to comment.