Commit 67eacd61 authored by Will Deacon's avatar Will Deacon

Merge branch 'for-next/acpi' into for-next/core

* for-next/acpi:
  ACPI: AGDI: Improve error reporting for problems during .remove()
parents e8d018dd 858a5663
...@@ -64,8 +64,11 @@ static int agdi_remove(struct platform_device *pdev) ...@@ -64,8 +64,11 @@ static int agdi_remove(struct platform_device *pdev)
int err, i; int err, i;
err = sdei_event_disable(adata->sdei_event); err = sdei_event_disable(adata->sdei_event);
if (err) if (err) {
return 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++) { for (i = 0; i < 3; i++) {
err = sdei_event_unregister(adata->sdei_event); err = sdei_event_unregister(adata->sdei_event);
...@@ -75,7 +78,11 @@ static int agdi_remove(struct platform_device *pdev) ...@@ -75,7 +78,11 @@ static int agdi_remove(struct platform_device *pdev)
schedule(); 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 = { static struct platform_driver agdi_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment