diff options
| author | Will Deacon <[email protected]> | 2023-04-20 11:21:31 +0100 |
|---|---|---|
| committer | Will Deacon <[email protected]> | 2023-04-20 11:21:31 +0100 |
| commit | 67eacd616ba4f6a5cd6fa236a0c8365bb91a718a (patch) | |
| tree | 02c94fc4340aca6b989a8b14dbaa82cc0f54c53b | |
| parent | e8d018dd0257f744ca50a729e3d042cf2ec9da65 (diff) | |
| parent | 858a56630a840aba0e291fd4958e9a8f74638d56 (diff) | |
Merge branch 'for-next/acpi' into for-next/core
* for-next/acpi:
ACPI: AGDI: Improve error reporting for problems during .remove()
| -rw-r--r-- | drivers/acpi/arm64/agdi.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/acpi/arm64/agdi.c b/drivers/acpi/arm64/agdi.c index cf31abd0ed1b..f605302395c3 100644 --- a/drivers/acpi/arm64/agdi.c +++ b/drivers/acpi/arm64/agdi.c @@ -64,8 +64,11 @@ static int agdi_remove(struct platform_device *pdev) int err, i; err = sdei_event_disable(adata->sdei_event); - if (err) - return err; + if (err) { + dev_err(&pdev->dev, "Failed to disable sdei-event #%d (%pe)\n", + adata->sdei_event, ERR_PTR(err)); + return 0; + } for (i = 0; i < 3; i++) { err = sdei_event_unregister(adata->sdei_event); @@ -75,7 +78,11 @@ static int agdi_remove(struct platform_device *pdev) schedule(); } - return err; + if (err) + dev_err(&pdev->dev, "Failed to unregister sdei-event #%d (%pe)\n", + adata->sdei_event, ERR_PTR(err)); + + return 0; } static struct platform_driver agdi_driver = { |