Merge branch 'acpi-fixes'

* acpi-fixes:
  ACPI / video: ignore BIOS initial backlight value for Fujitsu E753
  PNP / ACPI: avoid garbage in resource name
  ACPI / memhotplug: Fix a stale pointer in error path
  ACPI / scan: Always call acpi_bus_scan() for bus check notifications
  ACPI / scan: Do not try to attach scan handlers to devices having them

5 files changed, 20 insertions, 5 deletions

diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index c711d1144044..999adb5499c7 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -323,6 +323,7 @@ static int acpi_memory_device_add(struct acpi_device *device,
         /* Get the range from the _CRS */
         result = acpi_memory_get_device_resources(mem_device);
         if (result) {
+                device->driver_data = NULL;
                 kfree(mem_device);
                 return result;
         }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 10985573aaa7..8a46c924effd 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -352,10 +352,12 @@ static void acpi_scan_bus_device_check(acpi_handle handle, u32 ost_source)
         mutex_lock(&acpi_scan_lock);
         lock_device_hotplug();
 
-        acpi_bus_get_device(handle, &device);
-        if (device) {
-                dev_warn(&device->dev, "Attempt to re-insert\n");
-                goto out;
+        if (ost_source != ACPI_NOTIFY_BUS_CHECK) {
+                acpi_bus_get_device(handle, &device);
+                if (device) {
+                        dev_warn(&device->dev, "Attempt to re-insert\n");
+                        goto out;
+                }
         }
         acpi_evaluate_hotplug_ost(handle, ost_source,
                                   ACPI_OST_SC_INSERT_IN_PROGRESS, NULL);
@@ -1981,6 +1983,9 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
         if (acpi_bus_get_device(handle, &device))
                 return AE_CTRL_DEPTH;
 
+        if (device->handler)
+                return AE_OK;
+
         ret = acpi_scan_attach_handler(device);
         if (ret)
                 return ret > 0 ? AE_OK : AE_CTRL_DEPTH;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 5d7075d25700..e441876f5d5b 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -450,6 +450,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
         },
         {
          .callback = video_ignore_initial_backlight,
+         .ident = "Fujitsu E753",
+         .matches = {
+                DMI_MATCH(DMI_BOARD_VENDOR, "FUJITSU"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E753"),
+                },
+        },
+        {
+         .callback = video_ignore_initial_backlight,
          .ident = "HP Pavilion dm4",
          .matches = {
                 DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 9847ab163829..167f3d00c916 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -180,7 +180,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
         struct pnp_dev *dev = data;
         struct acpi_resource_dma *dma;
         struct acpi_resource_vendor_typed *vendor_typed;
-        struct resource r;
+        struct resource r = {0};
         int i, flags;
 
         if (acpi_dev_resource_memory(res, &r)
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 3e6db1c1dc29..d95e101ffb43 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -515,6 +515,7 @@ struct pnp_resource *pnp_add_resource(struct pnp_dev *dev,
         }
 
         pnp_res->res = *res;
+        pnp_res->res.name = dev->name;
         dev_dbg(&dev->dev, "%pR\n", res);
         return pnp_res;
 }