lkml.org 
[lkml]   [2014]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 129/134] media: hdpvr: register the video node at the end of probe
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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));



    \
     
     \ /
      Last update: 2014-04-10 11:21    [W:4.573 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site