summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAzael Avalos2015-09-09 19:25:44 +0200
committerDarren Hart2015-09-10 23:23:34 +0200
commitcf680eae34d26bd474c2ed3bd7d3aff59054aed5 (patch)
treeb6d27ebdffcb1bf7cb460d28e0877cacff07144e
parentwmi: Remove private %pUL implementation (diff)
downloadkernel-qcow2-linux-cf680eae34d26bd474c2ed3bd7d3aff59054aed5.tar.gz
kernel-qcow2-linux-cf680eae34d26bd474c2ed3bd7d3aff59054aed5.tar.xz
kernel-qcow2-linux-cf680eae34d26bd474c2ed3bd7d3aff59054aed5.zip
toshiba_acpi: Fix USB Sleep and Music always disabled
Commit e1a949c1b988 ("toshiba_acpi: Refactor *{get, set} functions return value") made changes on the return type of the HCI/SCI functions, but a typo on the USB Sleep and Music code is always reporting non existent support for such feature. This patch corrects the typo, changing an assignment to a comparison, making the laptops with actual support for such feature to work again. Signed-off-by: Azael Avalos <coproscefalo@gmail.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--drivers/platform/x86/toshiba_acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 6740c513919c..c434b53323ed 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)