Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755643AbbDJLlu (ORCPT ); Fri, 10 Apr 2015 07:41:50 -0400 Received: from mga02.intel.com ([134.134.136.20]:24017 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755528AbbDJLlo (ORCPT ); Fri, 10 Apr 2015 07:41:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,556,1422950400"; d="scan'208";a="706812599" From: "Kweh, Hock Leong" To: Ming Lei , Matt Fleming , Greg Kroah-Hartman Cc: Ong Boon Leong , "Kweh, Hock Leong" , LKML , linux-efi@vger.kernel.org, Sam Protsenko , Peter Jones , Andy Lutomirski , Roy Franz , Borislav Petkov Subject: [PATCH v3 2/3] firmware_loader: fix positive return value being treat as error return Date: Sat, 11 Apr 2015 03:40:43 +0800 Message-Id: <1428694844-7782-3-git-send-email-hock.leong.kweh@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1428694844-7782-1-git-send-email-hock.leong.kweh@intel.com> References: <1428694844-7782-1-git-send-email-hock.leong.kweh@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1163 Lines: 34 From: "Kweh, Hock Leong" Due to wait_for_completion_interruptible_timeout() will return its remaining timeout jiffies value if timeout does not happen, the error check code "if (ret)" will treat that as error return. So, fixing the issue by re-assigning back a 'Zero' to the return value when the wait is completed without timeout. Signed-off-by: Kweh, Hock Leong --- drivers/base/firmware_class.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index e03235d..b38975d 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -923,6 +923,8 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, mutex_lock(&fw_lock); fw_load_abort(fw_priv); mutex_unlock(&fw_lock); + } else { + retval = 0; } if (is_fw_load_aborted(buf)) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/