diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2016-10-12 05:10:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-11-16 12:41:13 -0200 |
| commit | 15a78313b7fd43763aeba584c385f1fb17a1bdb5 (patch) | |
| tree | 81da1b4c9bb768b7982b473783634ead17a3feb5 /drivers/media/platform/davinci/vpbe.c | |
| parent | 837fdcf05af645c3961cae69fd188a0fee1add52 (diff) | |
[media] DaVinci-VPBE: Rename a jump label in vpbe_set_output()
Adjust jump labels according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/davinci/vpbe.c')
| -rw-r--r-- | drivers/media/platform/davinci/vpbe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index 77b3365b71ef..968c2a67468f 100644 --- a/drivers/media/platform/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c @@ -254,20 +254,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; } if_params = cfg->outputs[index].if_params; venc_device->setup_if_config(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 @@ -289,7 +289,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; } |