diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-01 01:21:11 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-01 01:21:11 +0300 |
| commit | 5c0e869357454c2aab3d02d002ffc1f0a0ab2782 (patch) | |
| tree | de3bf0f70d24fc33d791f776513593da5217ea08 /drivers/platform/x86/toshiba_acpi.c | |
| parent | baafd373e9287f20ca0c9a6bb38eb6785a146ac2 (diff) | |
| parent | ed14ee0eea8b6808025356cecc87a8007885263f (diff) | |
| download | linux-5c0e869357454c2aab3d02d002ffc1f0a0ab2782.tar.xz | |
Merge tag 'asoc-fix-v4.3-rc2' into asoc-pxa
ASoC: Fixes for v4.3
A disappointingly large set of fixes, though none of them very big and
very widely spread over many different drivers. Nothing especially
stands out, it's mostly all device specific and relatively minor.
Diffstat (limited to 'drivers/platform/x86/toshiba_acpi.c')
| -rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 6740c513919c..f2372f400ddb 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -938,7 +938,7 @@ static int toshiba_usb_sleep_music_get(struct toshiba_acpi_dev *dev, u32 *state) else if (result == TOS_NOT_SUPPORTED) return -ENODEV; - return result = TOS_SUCCESS ? 0 : -EIO; + return result == TOS_SUCCESS ? 0 : -EIO; } static int toshiba_usb_sleep_music_set(struct toshiba_acpi_dev *dev, u32 state) @@ -2398,11 +2398,9 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) if (error) return error; - error = toshiba_hotkey_event_type_get(dev, &events_type); - if (error) { - pr_err("Unable to query Hotkey Event Type\n"); - return error; - } + if (toshiba_hotkey_event_type_get(dev, &events_type)) + pr_notice("Unable to query Hotkey Event Type\n"); + dev->hotkey_event_type = events_type; dev->hotkey_dev = input_allocate_device(); |