From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752806AbbCJJpt (ORCPT ); Tue, 10 Mar 2015 05:45:49 -0400 Received: from mail.data-modul.de ([212.184.205.171]:21091 "EHLO mail2.data-modul.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751057AbbCJJpr (ORCPT ); Tue, 10 Mar 2015 05:45:47 -0400 From: Zahari Doychev To: ming.lei@canonical.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Cc: zahari.doychev@linux.com Subject: [PATCH v2] drivers: base: fw: fix ret value when loading fw Date: Tue, 10 Mar 2015 10:45:40 +0100 Message-Id: <1425980740-18919-1-git-send-email-zahari.doychev@linux.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When using the user mode helper to load firmwares the function _request_firmware gets a positive return value from fw_load_from_user_helper and because of this the firmware buffer is not assigned. This happens only when the return value is zero. This patch fixes this problem in _request_firmware_load. When the completion is ready the return value is set to zero. Signed-off-by: Zahari Doychev --- Changes from v1: - move handling of wait_for_completion_interruptible_timeout() return value 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 6c5c9ed..4996541 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -913,6 +913,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 if (retval > 0) { + retval = 0; } if (is_fw_load_aborted(buf)) -- 2.3.0