From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932464AbbCIP7A (ORCPT ); Mon, 9 Mar 2015 11:59:00 -0400 Received: from mail.data-modul.de ([212.184.205.171]:38309 "EHLO mail2.data-modul.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752411AbbCIP6z (ORCPT ); Mon, 9 Mar 2015 11:58:55 -0400 From: Zahari Doychev To: ming.lei@canonical.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Cc: zahari.doychev@linux.com Subject: [PATCH] drivers: base: fw: fix ret value when loading fw Date: Mon, 9 Mar 2015 16:49:52 +0100 Message-Id: <1425916192-31600-2-git-send-email-zahari.doychev@linux.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1425916192-31600-1-git-send-email-zahari.doychev@linux.com> References: <1425916192-31600-1-git-send-email-zahari.doychev@linux.com> 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 --- drivers/base/firmware_class.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 6c5c9ed..9642e5f 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -920,6 +920,10 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, else if (!buf->data) retval = -ENOMEM; + /* wait for completion was successful so return ok */ + if (retval > 0) + retval = 0; + device_remove_file(f_dev, &dev_attr_loading); err_del_bin_attr: device_remove_bin_file(f_dev, &firmware_attr_data); -- 2.3.0