All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: Mark Pearson <markpearson@lenovo.com>
Cc: mgross@linux.intel.com, platform-driver-x86@vger.kernel.org
Subject: Re: [PATCH] platform/x86: thinkpad_acpi: correct palmsensor error checking
Date: Mon, 4 Jan 2021 15:56:29 +0100	[thread overview]
Message-ID: <e10adbc2-d599-72f3-c903-f08933856f76@redhat.com> (raw)
In-Reply-To: <20201230024726.7861-1-markpearson@lenovo.com>

Hi,

On 12/30/20 3:47 AM, Mark Pearson wrote:
> The previous commit adding functionality for the palm sensor had a
> mistake which meant the error conditions on initialisation was not checked
> correctly. On some older platforms this meant that if the sensor wasn't
> available an error would be returned and the driver would fail to load.
> 
> This commit corrects the error condition. Many thanks to Mario Oenning
> for reporting and determining the issue
> 
> Signed-off-by: Mark Pearson <markpearson@lenovo.com>

Thank you for your patch, I've applied this patch to my review-hans 
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Since this is a bugfix I will also cherry-pick this patch to the fixes
branch and include it in an upcoming fixes pull-req for 5.11.

Regards,

Hans

> ---
>  drivers/platform/x86/thinkpad_acpi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index e03df2881dc6..c102657b3eb3 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -9951,9 +9951,9 @@ static int tpacpi_proxsensor_init(struct ibm_init_struct *iibm)
>  	if ((palm_err == -ENODEV) && (lap_err == -ENODEV))
>  		return 0;
>  	/* Otherwise, if there was an error return it */
> -	if (palm_err && (palm_err != ENODEV))
> +	if (palm_err && (palm_err != -ENODEV))
>  		return palm_err;
> -	if (lap_err && (lap_err != ENODEV))
> +	if (lap_err && (lap_err != -ENODEV))
>  		return lap_err;
>  
>  	if (has_palmsensor) {
> 


  reply	other threads:[~2021-01-04 14:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-30  2:47 [PATCH] platform/x86: thinkpad_acpi: correct palmsensor error checking Mark Pearson
2021-01-04 14:56 ` Hans de Goede [this message]
2021-01-04 15:17 ` Andy Shevchenko
2021-01-04 15:32   ` Hans de Goede
2021-01-04 15:43     ` [External] " Mark Pearson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e10adbc2-d599-72f3-c903-f08933856f76@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=markpearson@lenovo.com \
    --cc=mgross@linux.intel.com \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.