tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

leds/acpi: Fix merge fallout from acpi_driver_data change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

authored by Stephen Rothwell and committed by Richard Purdie 601a1b92 fbf0baee

+1 -1
unified split
+1 -1
drivers/leds/leds-hp-disk.c
··· 98 adev.device = device; 99 strcpy(acpi_device_name(device), DRIVER_NAME); 100 strcpy(acpi_device_class(device), ACPI_MDPS_CLASS); 101 - acpi_driver_data(device) = &adev; 102 103 ret = led_classdev_register(NULL, &hpled_led); 104 return ret;
··· 98 adev.device = device; 99 strcpy(acpi_device_name(device), DRIVER_NAME); 100 strcpy(acpi_device_class(device), ACPI_MDPS_CLASS); 101 + device->driver_data = &adev; 102 103 ret = led_classdev_register(NULL, &hpled_led); 104 return ret;