| Message ID | 20220821200821.1837460-2-lkml@vorpal.se (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86: Fixes for Toshiba Z830 | expand |
Hi, On 8/21/22 22:08, Arvid Norlander wrote: > The toshiba_acpi driver checks for TOS_INPUT_DATA_ERROR and tries a > different format. On the Z830 the error returned is TOS_NOT_SUPPORTED > though the different format still works. Allow either error. > > Signed-off-by: Arvid Norlander <lkml@vorpal.se> 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. Regards, Hans > --- > drivers/platform/x86/toshiba_acpi.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c > index 0fc9e8b8827b..6cc617b2940e 100644 > --- a/drivers/platform/x86/toshiba_acpi.c > +++ b/drivers/platform/x86/toshiba_acpi.c > @@ -675,12 +675,15 @@ static void toshiba_eco_mode_available(struct toshiba_acpi_dev *dev) > return; > } > > - if (out[0] == TOS_INPUT_DATA_ERROR) { > + if (out[0] == TOS_INPUT_DATA_ERROR || out[0] == TOS_NOT_SUPPORTED) { > /* > * If we receive 0x8300 (Input Data Error), it means that the > * LED device is present, but that we just screwed the input > * parameters. > * > + * On some laptops 0x8000 (Not supported) is also returned in > + * this case, so we need to allow for that as well. > + * > * Let's query the status of the LED to see if we really have a > * success response, indicating the actual presense of the LED, > * bail out otherwise.
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 0fc9e8b8827b..6cc617b2940e 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -675,12 +675,15 @@ static void toshiba_eco_mode_available(struct toshiba_acpi_dev *dev) return; } - if (out[0] == TOS_INPUT_DATA_ERROR) { + if (out[0] == TOS_INPUT_DATA_ERROR || out[0] == TOS_NOT_SUPPORTED) { /* * If we receive 0x8300 (Input Data Error), it means that the * LED device is present, but that we just screwed the input * parameters. * + * On some laptops 0x8000 (Not supported) is also returned in + * this case, so we need to allow for that as well. + * * Let's query the status of the LED to see if we really have a * success response, indicating the actual presense of the LED, * bail out otherwise.
The toshiba_acpi driver checks for TOS_INPUT_DATA_ERROR and tries a different format. On the Z830 the error returned is TOS_NOT_SUPPORTED though the different format still works. Allow either error. Signed-off-by: Arvid Norlander <lkml@vorpal.se> --- drivers/platform/x86/toshiba_acpi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)