diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-07 18:47:38 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-07 18:47:38 -0200 |
| commit | 548e138c20f2155b8ffecde6bddcc2d591f1688f (patch) | |
| tree | 6406d15182cb6f92fbf74ca5ec0487dc68cbcda3 /linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |
| parent | ea7f3e04e73a899fbd3ffb74418fbee30b9abc6c (diff) | |
| parent | 47afcf131805c1773242a182777117da38956ffc (diff) | |
| download | mediapointer-dvb-s2-548e138c20f2155b8ffecde6bddcc2d591f1688f.tar.gz mediapointer-dvb-s2-548e138c20f2155b8ffecde6bddcc2d591f1688f.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cleanups
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index b192db67e..69f2a7d32 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -206,6 +206,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, memcpy(cap, &pvr_capability, sizeof(struct v4l2_capability)); strlcpy(cap->bus_info,pvr2_hdw_get_bus_info(hdw), sizeof(cap->bus_info)); + strlcpy(cap->card,pvr2_hdw_get_desc(hdw),sizeof(cap->card)); ret = 0; break; @@ -1016,10 +1017,8 @@ static int pvr2_v4l2_iosetup(struct pvr2_v4l2_fh *fh) sp = fh->dev_info->stream->stream; pvr2_stream_set_callback(sp,(pvr2_stream_callback)pvr2_v4l2_notify,fh); pvr2_hdw_set_stream_type(hdw,fh->dev_info->config); - pvr2_hdw_set_streaming(hdw,!0); - ret = pvr2_ioread_set_enabled(fh->rhp,!0); - - return ret; + if ((ret = pvr2_hdw_set_streaming(hdw,!0)) < 0) return ret; + return pvr2_ioread_set_enabled(fh->rhp,!0); } |