ACPI: Remember to clear acpi_dev->driver after calling ops.remove()
PATCH 1/1 ACPI: Remember to clear acpi_dev->driver after calling ops.remove()
If an error occurs while binding a driver to a device and we call remove(), we should also clear acpi->driver and acpi_dev->driverdata. Otherwise bad things will happen e.g. we will invoke the suspend() driver callback when the system is suspended, even though the driver thinks it has been unbound from the device.
Also check the return value of acpi_start_single_object(). I'm not sure what will happen if we claim success despite seeing ops.start() fail and then calling ops.remove(), but it's not a good idea.
--- drivers/acpi/scan.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-)
drivers/acpi/scan.c +27 -18
@@ -423,26 +423,33 @@ static int acpi_device_probe(struct device * dev)int ret; ret =acpi_bus_driver_init (acpi_dev, acpi_drv); -if (!ret) { -if (acpi_dev->bus_ops.acpi_op_start) -acpi_start_single_object (acpi_dev); - -if (acpi_drv->ops.notify) { - ret =acpi_device_install_notify_handler (acpi_dev); -if (ret) { -if (acpi_drv->ops.remove) - acpi_drv->ops.remove (acpi_dev, - acpi_dev->removal_type); -return ret; - } - } +if (ret) +return ret; -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"Found driver [%s] for device [%s]\n" , - acpi_drv->name, acpi_dev->pnp.bus_id)); -get_device (dev); +if (acpi_dev->bus_ops.acpi_op_start) { + ret =acpi_start_single_object (acpi_dev); +if (ret) +return ret; } -return ret; + +if (acpi_drv->ops.notify) { + ret =acpi_device_install_notify_handler (acpi_dev); +if (ret) { +if (acpi_drv->ops.remove) + acpi_drv->ops.remove (acpi_dev, + acpi_dev->removal_type); + acpi_dev->driver =NULL ; + acpi_dev->driver_data =NULL ; +return ret; + } + } + +ACPI_DEBUG_PRINT ((ACPI_DB_INFO , +"Found driver [%s] for device [%s]\n" , + acpi_drv->name, acpi_dev->pnp.bus_id)); +get_device (dev); + +return 0 ; }static int acpi_device_remove (struct device * dev)
@@ -617,6 +624,8 @@ static int acpi_start_single_object(struct acpi_device *device) result = driver->ops.start (device);if (result && driver->ops.remove) driver->ops.remove (device,ACPI_BUS_REMOVAL_NORMAL ); + device->driver =NULL ; + device->driver_data =NULL ; }return result;
Signature · 1 line
1.6.3.2
Quoted 6 lines · Alan Jenkins
If an error occurs while binding a driver to a device and we call
remove(), we should also clearacpi->driverandacpi_dev->driverdata. Otherwise bad things will happen e.g. we will invoke thesuspend()driver callback when the system is suspended, even though the driver thinks it has been unbound from the device.
Quoted 6 lines
Also check the return value of
acpi_start_single_object(). I'm not sure what will happen if we claim success despite seeingops.start()fail and then callingops.remove(), but it's not a good idea.Signed-off-by Alan Jenkins <[email protected]>CC Bjorn Helgaas <[email protected]>
Thanks for fixing this, Alan. I introduced this bug in 46ec8598f.
Quoted 69 lines
--- drivers/acpi/scan.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-)drivers/acpi/scan.c +27
-18@@ -423,26 +423,33 @@ static int acpi_device_probe(struct device * dev)int ret; ret =acpi_bus_driver_init (acpi_dev, acpi_drv); -if (!ret) { -if (acpi_dev->bus_ops.acpi_op_start) -acpi_start_single_object (acpi_dev); - -if (acpi_drv->ops.notify) { - ret =acpi_device_install_notify_handler (acpi_dev); -if (ret) { -if (acpi_drv->ops.remove) - acpi_drv->ops.remove (acpi_dev, - acpi_dev->removal_type); -return ret; - } - } +if (ret) +return ret; -ACPI_DEBUG_PRINT ((ACPI_DB_INFO , -"Found driver [%s] for device [%s]\n" , - acpi_drv->name, acpi_dev->pnp.bus_id)); -get_device (dev); +if (acpi_dev->bus_ops.acpi_op_start) { + ret =acpi_start_single_object (acpi_dev); +if (ret) +return ret; } -return ret; + +if (acpi_drv->ops.notify) { + ret =acpi_device_install_notify_handler (acpi_dev); +if (ret) { +if (acpi_drv->ops.remove) + acpi_drv->ops.remove (acpi_dev, + acpi_dev->removal_type); + acpi_dev->driver =NULL ; + acpi_dev->driver_data =NULL ; +return ret; + } + } + +ACPI_DEBUG_PRINT ((ACPI_DB_INFO , +"Found driver [%s] for device [%s]\n" , + acpi_drv->name, acpi_dev->pnp.bus_id)); +get_device (dev); + +return 0 ; }static int acpi_device_remove (struct device * dev)@@ -617,6 +624,8 @@ static int acpi_start_single_object(struct acpi_device *device) result = driver->ops.start (device);if (result && driver->ops.remove) driver->ops.remove (device,ACPI_BUS_REMOVAL_NORMAL ); + device->driver =NULL ; + device->driver_data =NULL ; }return result;