Received: by 10.223.164.221 with SMTP id h29csp83684wrb; Fri, 6 Oct 2017 14:30:58 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDApvpxnmXMxXO0mvmvnkhffRdUJtH5cY5ix2Sf0q/mBa2oPuZR8lBak6exw1v3UqH8w87B X-Received: by 10.84.212.22 with SMTP id d22mr3021358pli.255.1507325458382; Fri, 06 Oct 2017 14:30:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507325458; cv=none; d=google.com; s=arc-20160816; b=OAZlbZjlJ8O2LPFIr9YRlw0K0eB510HVRZMgQN6URQQZ0NmzpzsPUZhcLmV2kOV8+x Q+9nCuuDys9h3MP1/qHy27ThxZuxkCl3ruOyGn1GORyHtCQN3HdbUIbSzfJY1/ZvZrCe UnvWMqMpxEz1yDRt6mBeCnV91ZoY4ZUwPUJ6TtEMigUk6VRZ0Rknkyw+WlPK53Zry8kR tqUIUOt6LQdkF9fJEva8l8p9sGKHfwMenS4LCZ0uHUrlrBbp/yKs8CXcjtczg3mqvzEj rwMjWmuMIliBI6URO4qF89HQts3evVX2lN6mgsWVruzEQFIfHThEj1WJKzvOWxj4H7T7 nmkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=zlr27dea48cTaL3ij9FOvZeoyQGE5gq/fEO+Q9qOdc8=; b=PKDQFRvn0BpjrgSt5fCZ0Cug97y0uqvIACnaM4FMVoQDd3RIJO8CONVWW1oHf9TW9D z7SmFx/Vr5QIJkO6/26CSKYwokVsZYKL+vzj48Tc7lVmnDd2pMqgo7o53ncOOa1pMb7i iFzsbJnbEqJl/dE9q1vc/prZXvFkB6/leV7m0V5/RxhWZ+Y0WmERCAhJR8k6/5TwVfFo ZUaL+EztQ5A+2c/0UrZQjC7lpFFcMfm+c5dOPeP2qMuhMmpeD4q46indIe+XH7MBtepO y+abwWsoGz1TbhSx+Lw9UsGe9HjR6HBNkMx/DgtY0lCUWRPFhNN0dkKy+cLmSgvKa5Q+ 3poQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f33si1959067plf.618.2017.10.06.14.30.42; Fri, 06 Oct 2017 14:30:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752702AbdJFVaQ (ORCPT + 99 others); Fri, 6 Oct 2017 17:30:16 -0400 Received: from osg.samsung.com ([64.30.133.232]:39151 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751618AbdJFVaO (ORCPT ); Fri, 6 Oct 2017 17:30:14 -0400 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id C370515468; Fri, 6 Oct 2017 14:30:13 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at dev.s-opensource.com X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from osg.samsung.com ([127.0.0.1]) by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cTIoT8ymimqg; Fri, 6 Oct 2017 14:30:12 -0700 (PDT) Received: from localhost.localdomain (c-24-9-64-241.hsd1.co.comcast.net [24.9.64.241]) by osg.samsung.com (Postfix) with ESMTPSA id 3580015455; Fri, 6 Oct 2017 14:30:12 -0700 (PDT) From: Shuah Khan To: kyungmin.park@samsung.com, kamil@wypas.org, jtp.park@samsung.com, a.hajda@samsung.com, mchehab@kernel.org Cc: Shuah Khan , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] media: s5p-mfc: check for firmware allocation before requesting firmware Date: Fri, 6 Oct 2017 15:30:07 -0600 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Check if firmware is allocated before requesting firmware instead of requesting firmware only to release it if firmware is not allocated. Signed-off-by: Shuah Khan --- drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 69ef9c2..f064a0d1 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -55,6 +55,11 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) * into kernel. */ mfc_debug_enter(); + if (!dev->fw_buf.virt) { + mfc_err("MFC firmware is not allocated\n"); + return -EINVAL; + } + for (i = MFC_FW_MAX_VERSIONS - 1; i >= 0; i--) { if (!dev->variant->fw_name[i]) continue; @@ -75,11 +80,6 @@ int s5p_mfc_load_firmware(struct s5p_mfc_dev *dev) release_firmware(fw_blob); return -ENOMEM; } - if (!dev->fw_buf.virt) { - mfc_err("MFC firmware is not allocated\n"); - release_firmware(fw_blob); - return -EINVAL; - } memcpy(dev->fw_buf.virt, fw_blob->data, fw_blob->size); wmb(); release_firmware(fw_blob); -- 2.7.4 From 1583027119456523327@xxx Fri Nov 03 06:58:26 +0000 2017 X-GM-THRID: 1582953443006848179 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread