From patchwork Tue Sep 20 08:58:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9341355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 86C0A607D0 for ; Tue, 20 Sep 2016 08:59:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7836129D78 for ; Tue, 20 Sep 2016 08:59:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CCA629D7D; Tue, 20 Sep 2016 08:59:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 72D8E29D78 for ; Tue, 20 Sep 2016 08:59:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27DCE6E6AC; Tue, 20 Sep 2016 08:59:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.web.de (mout.web.de [212.227.17.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2330E6E6AC for ; Tue, 20 Sep 2016 08:59:06 +0000 (UTC) Received: from [192.168.1.2] ([77.182.226.232]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0MGiUP-1bi6201eq1-00Dbhh; Tue, 20 Sep 2016 10:59:01 +0200 Subject: [PATCH 3/6] GPU-DRM-GMA500: Move a variable assignment in mid_get_vbt_data_r10() To: dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie , Patrik Jakobsson References: <566ABCD9.1060404@users.sourceforge.net> <3c9785ef-4553-2e3d-2cb2-5cf6d1f31ccd@users.sourceforge.net> From: SF Markus Elfring Message-ID: <0d7ea29b-a070-8cdf-d2fb-9e0c190f5d09@users.sourceforge.net> Date: Tue, 20 Sep 2016 10:58:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <3c9785ef-4553-2e3d-2cb2-5cf6d1f31ccd@users.sourceforge.net> X-Provags-ID: V03:K0:TZW5hWBiuth4CERFtMhecH4Mhcwf3yClDVF+mHJOLNW8gFznRQq xxKo+mDO2MczdQa3zJQkq53VB7OY4PFh+cOJt8e7DPD4LDsYVQCKYIDvwH1g111w7z1uY3x 91gJ0sDfOwGCUFJhaauI0fERrXn8Xhua/cd5b9nUC2eTgjkdkZ5IWBCUfcJDaqiljwqJmzg TVOruD9UKQgx++as0ue/w== X-UI-Out-Filterresults: notjunk:1; V01:K0:H3tzp5alm0Q=:x05Erxb0EERq90hkX+215F j5a86XqBeNb+RyYiKqHud4fTtwv1e2nNQa83fOuMviJcjz6sehaWKH7SzEITQfBVTxTjHUSOj 3AEjbN4ulLmp7c7NIEirxplGWjQEbJLwVQl3xDQm6sLm4MlpAa7tMJhV2rcgs6c4ME0ebEtqt w8Y4y4BTUmHF9F/I0FvPGy66Hn7dhFdZhaxAfEONNhROoYYDXTkN7oW/n8B3xWoYlHZsPUg5H fy7rsgOYdYJfRWEljTX1gvfx980SVM59ELNzoyYIgkRdeJOCzYSb724/yQ1+rtEc1Q5b8Ln2R kRSyINyrUVR7WWq0vbyhajmf6IXnrxcLIi7lPfTQwTF0JTdi5Cd6XG9VSOKwnpnGMuZPn/LHk vqJOFFSaRaj6d9FgsugUwv0+v/z0opa6j03pmJDKLzcUhLz34USKwdyY65ESrapS2Z01wunfq 0usBFGdhY2qHp98gaTk9h3/6HBkUpolxLvDvfyDFCq/QhYHsbPJV7yeMQ406c++N/15hwyU25 IUYEiMQtSZb6Rp1WvuD7qSZFlyWQUnj8UKm4r6j2gYXlLL7rb309u1KZGWx6nlvEwiL4HqHBw /lOmGm+TMEP1/Jz+QASj9PdkrBrwh5exnKRG4TmTZUF0R1jZSbKQ5JP2ZxvX65bgG0kniVpQz Ypyqh/v/dIZSv4slWliiNw6iSAea3l8zdG7Tl8DSRkm2T2fXcCQr8L6nQqy9/QiE5gWtGUZwv 7Uc2W/gFlHXJiqGLJWMRGQbg8dIyWxN0zbdVEyawT+HNMPmr0JmWX8l5x3PhAFibt3tFnI/GV p9wgmf6 Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Tue, 20 Sep 2016 10:32:12 +0200 One local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. Signed-off-by: Markus Elfring --- drivers/gpu/drm/gma500/mid_bios.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c index cf4e605..3caee42 100644 --- a/drivers/gpu/drm/gma500/mid_bios.c +++ b/drivers/gpu/drm/gma500/mid_bios.c @@ -230,7 +230,7 @@ static int mid_get_vbt_data_r10(struct drm_psb_private *dev_priv, u32 addr) struct gct_r10 *gct; struct oaktrail_timing_info *dp_ti = &dev_priv->gct_data.DTD; struct gct_r10_timing_info *ti; - int ret = -1; + int ret; if (read_vbt_r10(addr, &vbt)) return -1; @@ -241,8 +241,10 @@ static int mid_get_vbt_data_r10(struct drm_psb_private *dev_priv, u32 addr) gct_virtual = ioremap(addr + sizeof(vbt), sizeof(*gct) * vbt.panel_count); - if (!gct_virtual) + if (!gct_virtual) { + ret = -1; goto free_gct; + } memcpy_fromio(gct, gct_virtual, sizeof(*gct)); iounmap(gct_virtual);