diff options
| author | Janne Grunau <j@jannau.net> | 2009-03-26 14:40:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:43:42 -0300 |
| commit | a50ab29185a9ec31e5a6999e53add0508653e889 (patch) | |
| tree | 40f9a24c5396f2eb269bd24005e8e8c2b8c7dc6f /drivers/media/video/hdpvr/hdpvr-video.c | |
| parent | d211bfcbd0f13f1234aaa6e565013dba051a408c (diff) | |
| download | op-kernel-dev-a50ab29185a9ec31e5a6999e53add0508653e889.zip op-kernel-dev-a50ab29185a9ec31e5a6999e53add0508653e889.tar.gz | |
V4L/DVB (11229): hdpvr: set usb interface dev as parent in struct video_device
Signed-off-by: Janne Grunau <j@jannau.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/hdpvr/hdpvr-video.c')
| -rw-r--r-- | drivers/media/video/hdpvr/hdpvr-video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index d63bfcc..9560e19 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c @@ -1193,7 +1193,8 @@ static const struct video_device hdpvr_video_template = { V4L2_STD_PAL_60, }; -int hdpvr_register_videodev(struct hdpvr_device *dev, int devnum) +int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent, + int devnum) { /* setup and register video device */ dev->video_dev = video_device_alloc(); @@ -1204,7 +1205,7 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, int devnum) *(dev->video_dev) = hdpvr_video_template; strcpy(dev->video_dev->name, "Hauppauge HD PVR"); - dev->video_dev->parent = &dev->udev->dev; + dev->video_dev->parent = parent; video_set_drvdata(dev->video_dev, dev); if (video_register_device(dev->video_dev, VFL_TYPE_GRABBER, devnum)) { |
