Merge branches 'release' and 'bugzilla-9910' into release

3 files changed, 8 insertions, 2 deletions

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index f29812a86533..40b0fcae4c78 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -60,5 +60,5 @@ obj-$(CONFIG_ACPI_ASUS)		+= asus_acpi.o
 obj-$(CONFIG_ACPI_TOSHIBA)      += toshiba_acpi.o
 obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)       += acpi_memhotplug.o
 obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
-obj-$(CONFIG_ACPI_SBS)          += sbs.o
 obj-$(CONFIG_ACPI_SBS)          += sbshc.o
+obj-$(CONFIG_ACPI_SBS)          += sbs.o
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 1194105cc3ca..585ae3c9c8ea 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -827,7 +827,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id)
 #endif
         printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n",
                ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device),
-               battery->name, sbs->battery->present ? "present" : "absent");
+               battery->name, battery->present ? "present" : "absent");
         return result;
 }
 
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index ae9a90438e2f..a2cf3008ce6c 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -117,6 +117,11 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
         int ret = -EFAULT, i;
         u8 temp, sz = 0;
 
+        if (!hc) {
+                printk(KERN_ERR PREFIX "host controller is not configured\n");
+                return ret;
+        }
+
         mutex_lock(&hc->lock);
         if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp))
                 goto end;
@@ -292,6 +297,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)
         hc = acpi_driver_data(device);
         acpi_ec_remove_query_handler(hc->ec, hc->query_bit);
         kfree(hc);
+        acpi_driver_data(device) = NULL;
         return 0;
 }