diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 01:56:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 01:56:39 -0400 |
| commit | 3b87bb640e77023c97cf209e3dd85887a1113ad0 (patch) | |
| tree | c4531d2c954bcc28706837cc67a8865677e51fbf /drivers/acpi/scan.c | |
| parent | 7a92d803227a523a9a5546e4e0dce1325a4b5926 (diff) | |
| parent | dcf52fb71d988ba945054308f661bddf9b2455fb (diff) | |
Merge branch 'bjorn-start-stop-2.6.32' into release
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 297d8b94fbb..7b90900b211 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -430,9 +430,6 @@ static int acpi_device_probe(struct device * dev) if (acpi_drv->ops.notify) { ret = acpi_device_install_notify_handler(acpi_dev); if (ret) { - if (acpi_drv->ops.stop) - acpi_drv->ops.stop(acpi_dev, - acpi_dev->removal_type); if (acpi_drv->ops.remove) acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type); @@ -456,8 +453,6 @@ static int acpi_device_remove(struct device * dev) if (acpi_drv) { if (acpi_drv->ops.notify) acpi_device_remove_notify_handler(acpi_dev); - if (acpi_drv->ops.stop) - acpi_drv->ops.stop(acpi_dev, acpi_dev->removal_type); if (acpi_drv->ops.remove) acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type); } |