ACPI: APEI: EINJ: Fix probe error message
Subsystems (3)
Jon Hunter
maintainerPATCH 1/1 ACPI: APEI: EINJ: Fix probe error message
Commit 6cb9441bfe8d ("ACPI: APEI: EINJ: Transition to the faux device interface") updated the APEI error injection driver to use the faux device interface and now for devices that don't support ACPI, the following error message is seen on boot:
ERR KERN faux acpi-einj: probe did not succeed, tearing down the device
The APEI error injection driver returns -ENODEV in the probe function if ACPI is not supported and so after transitioning the driver to the faux device interface, the error returned from the probe now causes the above error message to be displayed.
Fix this by moving the code that detects if ACPI is supported to the einj_init() function to fix the false error message displayed for devices that don't support ACPI.
--- drivers/acpi/apei/einj-core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/acpi/apei/einj-core.c +5 -5
@@ -755,11 +755,6 @@ static int __init einj_probe(struct faux_device *fdev)acpi_status status;struct apei_exec_context ctx; -if (acpi_disabled) { -pr_debug ("ACPI disabled.\n" ); -return -ENODEV ; - } - status =acpi_get_table (ACPI_SIG_EINJ ,0 , (struct acpi_table_header **)&einj_tab);if (status ==AE_NOT_FOUND ) {
@@ -886,6 +881,11 @@ static struct faux_device_ops einj_device_ops __refdata = {static int __init einj_init (void ) { +if (acpi_disabled) { +pr_debug ("ACPI disabled.\n" ); +return -ENODEV ; + } + einj_dev =faux_device_create ("acpi-einj" ,NULL , &einj_device_ops);if (!einj_dev)return -ENODEV ;
Signature · 1 line
2.43.0
Quoted 7 lines · Jon Hunter
Commit
6cb9441bfe8d("ACPI: APEI: EINJ: Transition to the faux device interface") updated the APEI error injection driver to use the faux device interface and now for devices that don't support ACPI, the following error message is seen on boot:ERR KERN faux acpi-einj: probe did not succeed, tearing down the device
Quoted 9 lines
The APEI error injection driver returns
-ENODEVin the probe function if ACPI is not supported and so after transitioning the driver to the faux device interface, the error returned from the probe now causes the above error message to be displayed.Fix this by moving the code that detects if ACPI is supported to the
einj_init()function to fix the false error message displayed for devices that don't support ACPI.
Good catch, it was silently passing error before.
Signature · 2 lines
Regards, Sudeep
Quoted 14 lines · Sudeep Holla
Quoted 12 lines · Jon Hunter
Commit
6cb9441bfe8d("ACPI: APEI: EINJ: Transition to the faux device interface") updated the APEI error injection driver to use the faux device interface and now for devices that don't support ACPI, the following error message is seen on boot:ERR KERN faux acpi-einj: probe did not succeed, tearing down the device
The APEI error injection driver returns
-ENODEVin the probe function if ACPI is not supported and so after transitioning the driver to the faux device interface, the error returned from the probe now causes the above error message to be displayed.
Quoted 8 lines
Quoted 4 lines
Fix this by moving the code that detects if ACPI is supported to the
einj_init()function to fix the false error message displayed for devices that don't support ACPI.Good catch, it was silently passing error before.
Reviewed-by Sudeep Holla <[email protected]>
Applied, thanks!
That said, when fixing a bug that is only present in linux-next and not yet in the mainline, I'd appreciate a note about this, especially if it carries a Fixes: tag, because I do rebase patches occasionally and the commit ids may get stale.