diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 12:28:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 12:28:06 -0700 |
commit | 6735a1971a00a29a96aa3ea5dc08912bfee95c51 (patch) | |
tree | 5bb4c18ddf11edae5ab634c130cbf24f355f94df /drivers/platform/x86/fujitsu-laptop.c | |
parent | 8c6f5e7359e5bd0616b686dd5e14b99a34103b32 (diff) | |
parent | c3a73ed8a82b666ac01466d3badd7824eae89c44 (diff) |
Merge tag 'platform-drivers-x86-v4.13-2' of git://git.infradead.org/linux-platform-drivers-x86
Pull more x86 platform driver updates from Darren Hart:
"Add new platform matches for silead_dmi and ideapad-laptop. Several
constify patches for attribute_group structures. Fixes for peaq-wmi
and intel_telemetry.
silead_dmi:
- Add entry for Ployer Momo7w tablet touchscreen
- Add touchscreen info for I.T.Works TW891 2-in-1
toshiba_acpi:
- constify attribute_group structures.
asus-wmi:
- constify attribute_group structures.
panasonic-laptop:
- constify attribute_group structures.
alienware-wmi:
- constify attribute_group structures.
samsung-laptop:
- constify attribute_group structures.
compal-laptop:
- constify attribute_group structures.
fujitsu-laptop:
- constify attribute_group structures.
- add NULL check on devm_kzalloc() return value
peaq-wmi:
- Fix peaq_ignore_events_counter handling off by 1
ideapad-laptop:
- Fix indentation in DMI table
- Add several models to no_hw_rfkill
- Add IdeaPad V510-15IKB to no_hw_rfkill
intel_telemetry:
- Add debugfs entry for S0ix residency
intel_telemetry_debugfs:
- fix some error codes in init
- fix oops when load/unload module"
* tag 'platform-drivers-x86-v4.13-2' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: silead_dmi: Add entry for Ployer Momo7w tablet touchscreen
platform/x86: toshiba_acpi: constify attribute_group structures.
platform/x86: asus-wmi: constify attribute_group structures.
platform/x86: panasonic-laptop: constify attribute_group structures.
platform/x86: alienware-wmi: constify attribute_group structures.
platform/x86: samsung-laptop: constify attribute_group structures.
platform/x86: compal-laptop: constify attribute_group structures.
platform/x86: fujitsu-laptop: constify attribute_group structures.
platform/x86: peaq-wmi: Fix peaq_ignore_events_counter handling off by 1
platform/x86: fujitsu-laptop: add NULL check on devm_kzalloc() return value
platform/x86: silead_dmi: Add touchscreen info for I.T.Works TW891 2-in-1
platform/x86: ideapad-laptop: Fix indentation in DMI table
platform/x86: ideapad-laptop: Add several models to no_hw_rfkill
platform/x86: ideapad-laptop: Add IdeaPad V510-15IKB to no_hw_rfkill
platform/x86: intel_telemetry: Add debugfs entry for S0ix residency
platform/x86: intel_telemetry_debugfs: fix some error codes in init
platform/x86: intel_telemetry_debugfs: fix oops when load/unload module
Diffstat (limited to 'drivers/platform/x86/fujitsu-laptop.c')
-rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index c1a852847d02..85de30f93a9c 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -317,7 +317,7 @@ static struct attribute *fujitsu_pf_attributes[] = { NULL }; -static struct attribute_group fujitsu_pf_attribute_group = { +static const struct attribute_group fujitsu_pf_attribute_group = { .attrs = fujitsu_pf_attributes }; @@ -695,6 +695,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) if (call_fext_func(device, FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); + if (!led) + return -ENOMEM; + led->name = "fujitsu::logolamp"; led->brightness_set_blocking = logolamp_set; led->brightness_get = logolamp_get; @@ -707,6 +710,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) FUNC_LEDS, 0x0, 0x0, 0x0) & KEYBOARD_LAMPS) && (call_fext_func(device, FUNC_BUTTONS, 0x0, 0x0, 0x0) == 0x0)) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); + if (!led) + return -ENOMEM; + led->name = "fujitsu::kblamps"; led->brightness_set_blocking = kblamps_set; led->brightness_get = kblamps_get; @@ -723,6 +729,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) */ if (call_fext_func(device, FUNC_BUTTONS, 0x0, 0x0, 0x0) & BIT(24)) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); + if (!led) + return -ENOMEM; + led->name = "fujitsu::radio_led"; led->brightness_set_blocking = radio_led_set; led->brightness_get = radio_led_get; @@ -741,6 +750,9 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) (call_fext_func(device, FUNC_LEDS, 0x2, ECO_LED, 0x0) != UNSUPPORTED_CMD)) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); + if (!led) + return -ENOMEM; + led->name = "fujitsu::eco_led"; led->brightness_set_blocking = eco_led_set; led->brightness_get = eco_led_get; |