summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-05 07:56:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-05 07:56:10 -0300
commitea8dbc7189efcfa7dbfc93f5deca1df176c5a3ef (patch)
tree49934cc102b523b77ef182fe7e13e563f7c7fb5a /linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
parent71bde24b27b74e98e8c4a4b253994b5e05ca42bf (diff)
parent81fd2420e39ed720ba99ea0278b6daac6d65d200 (diff)
downloadmediapointer-dvb-s2-ea8dbc7189efcfa7dbfc93f5deca1df176c5a3ef.tar.gz
mediapointer-dvb-s2-ea8dbc7189efcfa7dbfc93f5deca1df176c5a3ef.tar.bz2
merge: http://hg.jannau.net/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index def29ddb3..c1fd23e1f 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2591,7 +2591,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
hdw->ctl_read_urb = usb_alloc_urb(0,GFP_KERNEL);
if (!hdw->ctl_read_urb) goto fail;
- if (v4l2_device_register(&usb_dev->dev, &hdw->v4l2_dev) != 0) {
+ if (v4l2_device_register(&intf->dev, &hdw->v4l2_dev) != 0) {
pvr2_trace(PVR2_TRACE_ERROR_LEGS,
"Error registering with v4l core, giving up");
goto fail;