Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933806AbcJLPAx (ORCPT ); Wed, 12 Oct 2016 11:00:53 -0400 Received: from mout.web.de ([212.227.15.3]:59602 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933326AbcJLPAg (ORCPT ); Wed, 12 Oct 2016 11:00:36 -0400 Subject: [PATCH 22/34] [media] DaVinci-VPFE-Capture: Move two assignments in vpfe_s_input() To: linux-media@vger.kernel.org, Hans Verkuil , "Lad, Prabhakar" , Mauro Carvalho Chehab References: Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Wed, 12 Oct 2016 17:00:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:T19OjTsp5st/3JxUfm2dWZcT8P5Wuy/FfnAGuVWVuuJsa55+TRn k51eIc+Q5bmVhPMrN6WlB3hGcfJ0MaUTamXziYNq50BmCvMLLIM5mdRPOKnSUzsoowVCUOE qdBNGHLg7gU9r1E84dFml0vJPbezZVNv/ZOSbNJEwN67Ri8V0hYwECUYRcjceWxbofqfH60 2LyyGgqOo8ZbDvMPJWTXA== X-UI-Out-Filterresults: notjunk:1;V01:K0:CIBGOJOsB88=:P+xlbP7w+X/cZJKTuTqchV hpP7gjQR5h+tJ1IS2XQ3xroY3Nz3VWgRcjGgLyHGtuq8o5MmmbSthTrbRIKfftQrX0eASGcfd VJQnhsufQkecbLy/R7ldPmbI/838+cJ3uXJ4gnezESvQmFPxQETVzaWKA6n7ihVPzt+mBnaFH cCVykigfcO61cXJVs/A5Yi3JLjne1gMTqEJ0vHLQ8JK6+QsViWxivusupBw/sT2rkKkFmyRK+ 3mZvclrvjMcqmI8vYTZdr8lp+tXSq7H6emvKtpLf4l/7y6xMkVHICwlR/93OkwGzja1KhPamK m2AylSyf/iLsTMzw+7qX0MAavqAkoYgf9gGuz6cZbLMOO2X260q7B9mFbJNYtVM1TNKGOC1IN WscTMGo+fmf/T5e+TcQi9ZP+9V6KdFdMGAIEfxpc3v5+ohakUTto7e6HuJ7IEnAjR6233BheQ Eu6Uo08iOsXuhtgOEgbSWmk2vs8hwiKZft0jFtXQwSmNPmlawu31qnY9U0fV1cUYjsxapv0wJ 8Mev4LoUN3CbQzRGtUc3+r9qzSeBxNOY/DhRzPOf9eZPn+V3XHfMGkoYeAER2k5AGauwRggt1 G62PlXVvkdsvPSFp4A0sFhKEVrqMOqot68j3JtyXGtHQOkm2NytERKmWivAVzpi5ub46v+9tu IYNTWf7RCM5qRxU5xJySWEudA59xPjM94cKGe2VWrxAdgly1292nZKrovNmy5We5EaE8yv+V9 QHB4VJeboMm9RD1xpUIUUA8gXBptxcxUKKwjsG+PUUYgb5Dl/0Frw07qWCmDUzenjBgDZprlt 1s+cJhZ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1243 Lines: 37 From: Markus Elfring Date: Wed, 12 Oct 2016 11:22:23 +0200 Move assignments for two local variables into an else branch so that their setting will only be performed after corresponding data processing succeeded by this function. Signed-off-by: Markus Elfring --- drivers/media/platform/davinci/vpfe_capture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index ba71310..f0467fe 100644 --- a/drivers/media/platform/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c @@ -1111,7 +1111,7 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index) struct vpfe_subdev_info *sdinfo; int subdev_index, inp_index; struct vpfe_route *route; - u32 input = 0, output = 0; + u32 input, output; int ret; v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_input\n"); @@ -1144,6 +1144,9 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index) if (route && sdinfo->can_route) { input = route->input; output = route->output; + } else { + input = 0; + output = 0; } if (sd) -- 2.10.1