summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/gspca.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-13 21:34:28 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-13 21:34:28 -0300
commit88746190a13796f675da6145e682ef82f342fc85 (patch)
treeb9e420430479c23a84887e94500978bbc579c214 /linux/drivers/media/video/gspca/gspca.c
parent93f7a7d9cca47ccddea3b8d636fba2a193ff589c (diff)
parent43eb4bed6b1e4829af1beb79e3262cca641374ac (diff)
downloadmediapointer-dvb-s2-88746190a13796f675da6145e682ef82f342fc85.tar.gz
mediapointer-dvb-s2-88746190a13796f675da6145e682ef82f342fc85.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/gspca.c')
-rw-r--r--linux/drivers/media/video/gspca/gspca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c
index cfd27161b..b12974d5e 100644
--- a/linux/drivers/media/video/gspca/gspca.c
+++ b/linux/drivers/media/video/gspca/gspca.c
@@ -1955,7 +1955,7 @@ int gspca_dev_probe(struct usb_interface *intf,
/* init video stuff */
memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template);
- gspca_dev->vdev.parent = &dev->dev;
+ gspca_dev->vdev.parent = &intf->dev;
gspca_dev->module = module;
gspca_dev->present = 1;
ret = video_register_device(&gspca_dev->vdev,