| From 559a2e36f047ac7e1ab27c489322cfd1409dd842 Mon Sep 17 00:00:00 2001 |
| From: Hans Verkuil <hans.verkuil@cisco.com> |
| Date: Tue, 19 Mar 2013 09:34:58 -0300 |
| Subject: media: hdpvr: register the video node at the end of probe |
| |
| From: Hans Verkuil <hans.verkuil@cisco.com> |
| |
| commit 280847b532433ffe7a22795f926327805a127162 upstream. |
| |
| Video nodes can be used at once after registration, so make sure the full |
| initialization is done before registering them. |
| |
| Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> |
| [bwh: Backported to 3.2: adjust filename, context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| Cc: Jianguo Wu <wujianguo@huawei.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/video/hdpvr/hdpvr-core.c | 13 +++++++------ |
| 1 file changed, 7 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/media/video/hdpvr/hdpvr-core.c |
| +++ b/drivers/media/video/hdpvr/hdpvr-core.c |
| @@ -385,12 +385,6 @@ static int hdpvr_probe(struct usb_interf |
| } |
| mutex_unlock(&dev->io_mutex); |
| |
| - if (hdpvr_register_videodev(dev, &interface->dev, |
| - video_nr[atomic_inc_return(&dev_nr)])) { |
| - v4l2_err(&dev->v4l2_dev, "registering videodev failed\n"); |
| - goto error; |
| - } |
| - |
| #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
| retval = hdpvr_register_i2c_adapter(dev); |
| if (retval < 0) { |
| @@ -411,6 +405,13 @@ static int hdpvr_probe(struct usb_interf |
| } |
| #endif |
| |
| + retval = hdpvr_register_videodev(dev, &interface->dev, |
| + video_nr[atomic_inc_return(&dev_nr)]); |
| + if (retval < 0) { |
| + v4l2_err(&dev->v4l2_dev, "registering videodev failed\n"); |
| + goto error; |
| + } |
| + |
| /* let the user know what node this device is now attached to */ |
| v4l2_info(&dev->v4l2_dev, "device now attached to %s\n", |
| video_device_node_name(dev->video_dev)); |
