Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d47b180c authored by Len Brown's avatar Len Brown
Browse files

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

parents 249d621a bbafbecb

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/sbs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/acpi/sbshc.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

}