lkml.org 
[lkml]   [2016]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 11/34] [media] DaVinci-VPBE: Rename a jump label in vpbe_set_output()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Wed, 12 Oct 2016 10:10:19 +0200

    Adjust jump labels according to the Linux coding style convention.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/media/platform/davinci/vpbe.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
    index 6e7b0df..e68a792 100644
    --- a/drivers/media/platform/davinci/vpbe.c
    +++ b/drivers/media/platform/davinci/vpbe.c
    @@ -253,20 +253,20 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)
    sd_index = vpbe_find_encoder_sd_index(cfg, index);
    if (sd_index < 0) {
    ret = -EINVAL;
    - goto out;
    + goto unlock;
    }

    ret = venc_device->setup_if_config(cfg
    ->outputs[index].if_params);
    if (ret)
    - goto out;
    + goto unlock;
    }

    /* Set output at the encoder */
    ret = v4l2_subdev_call(vpbe_dev->encoders[sd_index], video,
    s_routing, 0, enc_out_index, 0);
    if (ret)
    - goto out;
    + goto unlock;

    /*
    * It is assumed that venc or extenal encoder will set a default
    @@ -288,7 +288,7 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)
    vpbe_dev->current_sd_index = sd_index;
    vpbe_dev->current_out_index = index;
    }
    -out:
    +unlock:
    mutex_unlock(&vpbe_dev->lock);
    return ret;
    }
    --
    2.10.1
    \
     
     \ /
      Last update: 2016-10-12 16:56    [W:4.155 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site