Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp7603390pxb; Thu, 18 Feb 2021 14:53:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJyua0nVxan3mr+qFHMQHYGM8ffg9Y1PE7HXbPEsBLiikKni26c/bwR5GPGYnD3yycXt8SrS X-Received: by 2002:a17:906:758:: with SMTP id z24mr5902047ejb.406.1613688828629; Thu, 18 Feb 2021 14:53:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613688828; cv=none; d=google.com; s=arc-20160816; b=OMyiAkeDC2luLSZWdnyZH9YknVzbDUARL4eAGSuPUdd9xb37bPjBOA2VCql6CoZ8NW zDifF84J4+MpEKLUF9KkSx82ud4XP5esslOiVTbVOFBw+/uJgBFRdP3hjBjzo25ozcpV ap2WQSIo4pEY3eWdFpRHPpig1gqV2mThAFP5ShIL4zRMwUoIQBdZ5OxGinIxOnQ9RW7x S2J9PAQS98T1fEPk+PeEDjrnXL8vGkvtKroAyq6LsL6aqNIchvQ4zqqTZ5XoLF7jT69n +JNT9gy9adwzEgD/X2jSk43SfmmuX1iB8HaxlGmP+g6t4qHwj+6bCdCLD4JGGI5yAjii VzQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:reply-to:message-id:subject:cc:to:from:date :ironport-sdr:ironport-sdr; bh=CttcHeZSchgt09PaDzIr7I2nM4QLsNntS7e1VQ9OhV8=; b=F4ztN/2lXKIM1GmKpaJR3X573FTGARP+PgioHD3KUCwtu6LhZpH7a/M5nM5W94uRMd BCRYO5zgnKaPvEFMAtF/YZaqOPtOw9m0I0odSbz2EOcxDrMbbyVxI+p5bfkpghcaL4Wu iBMpnVl+dh4JVeYbOsqBVhk6wcYgOAvBhZOC0nPm0JRbXVwYGr6wUvqpFc3MKkDY0Q7Z INuU+feQoaW54jSHD6FuovK9+S5yAOQ5Fmt/zqoXbywBsQnHSdTwFfBtm+0ZwZIllCMx PllRzquuA6Y8u/ormr6JXSxAHFLuUJpxT2/ULZsZvA7cHIi+lPSlYpQRL/lJWrKjYkdE ZK7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s13si4425005edj.330.2021.02.18.14.53.25; Thu, 18 Feb 2021 14:53:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229878AbhBRWuM (ORCPT + 99 others); Thu, 18 Feb 2021 17:50:12 -0500 Received: from mga11.intel.com ([192.55.52.93]:35419 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbhBRWuK (ORCPT ); Thu, 18 Feb 2021 17:50:10 -0500 IronPort-SDR: PXxltUC+nCXRkRD1ZCphu12L69b3/n52ZTBck7gMEGcnktVhzESg30ztCmseTu1xpneGEwEceH faW212by7VvQ== X-IronPort-AV: E=McAfee;i="6000,8403,9899"; a="180159390" X-IronPort-AV: E=Sophos;i="5.81,187,1610438400"; d="scan'208";a="180159390" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2021 14:48:49 -0800 IronPort-SDR: 3BbPWGw4358jO5fcFIuyRFXScJbK8dak/QttUQN57kkvj4q5/TFgX+DSB1kIA+Gfcj+TSIDEP+ AEXLQJWBYdbA== X-IronPort-AV: E=Sophos;i="5.81,187,1610438400"; d="scan'208";a="367709276" Received: from smtp.ostc.intel.com ([10.54.29.231]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2021 14:48:49 -0800 Received: from localhost (mtg-dev.jf.intel.com [10.54.74.10]) by smtp.ostc.intel.com (Postfix) with ESMTP id E694F6365; Thu, 18 Feb 2021 14:48:48 -0800 (PST) Date: Thu, 18 Feb 2021 14:48:48 -0800 From: mark gross To: Mario Limonciello Cc: Hans De Goede , Mark Gross , LKML , platform-driver-x86@vger.kernel.org, Divya Bharathi , Alexander Naumann Subject: Re: [PATCH] platform/x86: dell-wmi-sysman: correct an initialization failure Message-ID: <20210218224848.GB134379@linux.intel.com> Reply-To: mgross@linux.intel.com References: <20210218191723.20030-1-mario.limonciello@dell.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210218191723.20030-1-mario.limonciello@dell.com> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 18, 2021 at 01:17:23PM -0600, Mario Limonciello wrote: > On Dell systems that don't support this interface the module is > mistakingly returning error code "0", when it should be returning > -ENODEV. Correct a logic error to guarantee the correct return code. > > Cc: Divya Bharathi > Reported-by: Alexander Naumann > Signed-off-by: Mario Limonciello > --- > drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c | 4 +++- > drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c | 4 +++- > drivers/platform/x86/dell-wmi-sysman/sysman.c | 4 ++-- > 3 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c b/drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c > index f95d8ddace5a..8d59f81f9db4 100644 > --- a/drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c > +++ b/drivers/platform/x86/dell-wmi-sysman/biosattr-interface.c > @@ -175,7 +175,9 @@ static struct wmi_driver bios_attr_set_interface_driver = { > > int init_bios_attr_set_interface(void) > { > - return wmi_driver_register(&bios_attr_set_interface_driver); > + int ret = wmi_driver_register(&bios_attr_set_interface_driver); I have to ask if the propper fix should be in wmi_driver_register > + > + return wmi_priv.bios_attr_wdev ? ret : -ENODEV; Also, is there any point to call wmi_driver_register if returning -ENODEV? i.e. should the call to driver register be wrapped in a test for bios_atter_wdev? > } > > void exit_bios_attr_set_interface(void) > diff --git a/drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c b/drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c > index 5780b4d94759..bf449dc5ff47 100644 > --- a/drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c > +++ b/drivers/platform/x86/dell-wmi-sysman/passwordattr-interface.c > @@ -142,7 +142,9 @@ static struct wmi_driver bios_attr_pass_interface_driver = { > > int init_bios_attr_pass_interface(void) > { > - return wmi_driver_register(&bios_attr_pass_interface_driver); > + int ret = wmi_driver_register(&bios_attr_pass_interface_driver); > + > + return wmi_priv.password_attr_wdev ? ret : -ENODEV; same comments as above only for password_atter_wdev. --mark > } > > void exit_bios_attr_pass_interface(void) > diff --git a/drivers/platform/x86/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell-wmi-sysman/sysman.c > index cb81010ba1a2..d9ad0e83b66f 100644 > --- a/drivers/platform/x86/dell-wmi-sysman/sysman.c > +++ b/drivers/platform/x86/dell-wmi-sysman/sysman.c > @@ -513,13 +513,13 @@ static int __init sysman_init(void) > } > > ret = init_bios_attr_set_interface(); > - if (ret || !wmi_priv.bios_attr_wdev) { > + if (ret) { > pr_debug("failed to initialize set interface\n"); > goto fail_set_interface; > } > > ret = init_bios_attr_pass_interface(); > - if (ret || !wmi_priv.password_attr_wdev) { > + if (ret) { > pr_debug("failed to initialize pass interface\n"); > goto fail_pass_interface; > } > -- > 2.25.1 >