Skip to content

Commit 67eacd6

Browse files
committed
Merge branch 'for-next/acpi' into for-next/core
* for-next/acpi: ACPI: AGDI: Improve error reporting for problems during .remove()
2 parents e8d018d + 858a566 commit 67eacd6

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

drivers/acpi/arm64/agdi.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ static int agdi_remove(struct platform_device *pdev)
6464
int err, i;
6565

6666
err = sdei_event_disable(adata->sdei_event);
67-
if (err)
68-
return err;
67+
if (err) {
68+
dev_err(&pdev->dev, "Failed to disable sdei-event #%d (%pe)\n",
69+
adata->sdei_event, ERR_PTR(err));
70+
return 0;
71+
}
6972

7073
for (i = 0; i < 3; i++) {
7174
err = sdei_event_unregister(adata->sdei_event);
@@ -75,7 +78,11 @@ static int agdi_remove(struct platform_device *pdev)
7578
schedule();
7679
}
7780

78-
return err;
81+
if (err)
82+
dev_err(&pdev->dev, "Failed to unregister sdei-event #%d (%pe)\n",
83+
adata->sdei_event, ERR_PTR(err));
84+
85+
return 0;
7986
}
8087

8188
static struct platform_driver agdi_driver = {

0 commit comments

Comments
 (0)