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

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

* for-next/acpi:
  ACPI: AGDI: Improve error reporting for problems during .remove()
parents e8d018dd 858a5663

drivers/acpi/arm64/agdi.c

+10 −3
Original line number Diff line number Diff line
@@ -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 = {