diff options
author | Azael Avalos <coproscefalo@gmail.com> | 2015-04-02 21:26:21 -0400 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2015-04-07 23:47:31 -0400 |
commit | bb26f1893a086db77edca73529d5f59a8338ff30 (patch) | |
tree | 9878e461f560f8cb086cf5650f499361d2b041f3 /drivers/platform/x86 | |
parent | c8c918425ac88cf314db3a223dbbfd75ed6306d6 (diff) |
toshiba_acpi: Fix pr_* messages from USB Sleep Functions
This patch fixes the messages displayed by the USB Sleep Functions,
they were printing wrong messages not associated to the feature
currently queried.
Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 37f5f64976f1..f624dd56051f 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
@@ -965,11 +965,11 @@ static int toshiba_usb_rapid_charge_get(struct toshiba_acpi_dev *dev, | |||
965 | status = tci_raw(dev, in, out); | 965 | status = tci_raw(dev, in, out); |
966 | sci_close(dev); | 966 | sci_close(dev); |
967 | if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) { | 967 | if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) { |
968 | pr_err("ACPI call to get USB S&C battery level failed\n"); | 968 | pr_err("ACPI call to get USB Rapid Charge failed\n"); |
969 | return -EIO; | 969 | return -EIO; |
970 | } else if (out[0] == TOS_NOT_SUPPORTED || | 970 | } else if (out[0] == TOS_NOT_SUPPORTED || |
971 | out[0] == TOS_INPUT_DATA_ERROR) { | 971 | out[0] == TOS_INPUT_DATA_ERROR) { |
972 | pr_info("USB Sleep and Charge not supported\n"); | 972 | pr_info("USB Rapid Charge not supported\n"); |
973 | return -ENODEV; | 973 | return -ENODEV; |
974 | } | 974 | } |
975 | 975 | ||
@@ -993,10 +993,10 @@ static int toshiba_usb_rapid_charge_set(struct toshiba_acpi_dev *dev, | |||
993 | status = tci_raw(dev, in, out); | 993 | status = tci_raw(dev, in, out); |
994 | sci_close(dev); | 994 | sci_close(dev); |
995 | if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) { | 995 | if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) { |
996 | pr_err("ACPI call to set USB S&C battery level failed\n"); | 996 | pr_err("ACPI call to set USB Rapid Charge failed\n"); |
997 | return -EIO; | 997 | return -EIO; |
998 | } else if (out[0] == TOS_NOT_SUPPORTED) { | 998 | } else if (out[0] == TOS_NOT_SUPPORTED) { |
999 | pr_info("USB Sleep and Charge not supported\n"); | 999 | pr_info("USB Rapid Charge not supported\n"); |
1000 | return -ENODEV; | 1000 | return -ENODEV; |
1001 | } else if (out[0] == TOS_INPUT_DATA_ERROR) { | 1001 | } else if (out[0] == TOS_INPUT_DATA_ERROR) { |
1002 | return -EIO; | 1002 | return -EIO; |
@@ -1015,10 +1015,10 @@ static int toshiba_usb_sleep_music_get(struct toshiba_acpi_dev *dev, u32 *state) | |||
1015 | result = sci_read(dev, SCI_USB_SLEEP_MUSIC, state); | 1015 | result = sci_read(dev, SCI_USB_SLEEP_MUSIC, state); |
1016 | sci_close(dev); | 1016 | sci_close(dev); |
1017 | if (result == TOS_FAILURE) { | 1017 | if (result == TOS_FAILURE) { |
1018 | pr_err("ACPI call to set USB S&C mode failed\n"); | 1018 | pr_err("ACPI call to get Sleep and Music failed\n"); |
1019 | return -EIO; | 1019 | return -EIO; |
1020 | } else if (result == TOS_NOT_SUPPORTED) { | 1020 | } else if (result == TOS_NOT_SUPPORTED) { |
1021 | pr_info("USB Sleep and Charge not supported\n"); | 1021 | pr_info("Sleep and Music not supported\n"); |
1022 | return -ENODEV; | 1022 | return -ENODEV; |
1023 | } else if (result == TOS_INPUT_DATA_ERROR) { | 1023 | } else if (result == TOS_INPUT_DATA_ERROR) { |
1024 | return -EIO; | 1024 | return -EIO; |
@@ -1037,10 +1037,10 @@ static int toshiba_usb_sleep_music_set(struct toshiba_acpi_dev *dev, u32 state) | |||
1037 | result = sci_write(dev, SCI_USB_SLEEP_MUSIC, state); | 1037 | result = sci_write(dev, SCI_USB_SLEEP_MUSIC, state); |
1038 | sci_close(dev); | 1038 | sci_close(dev); |
1039 | if (result == TOS_FAILURE) { | 1039 | if (result == TOS_FAILURE) { |
1040 | pr_err("ACPI call to set USB S&C mode failed\n"); | 1040 | pr_err("ACPI call to set Sleep and Music failed\n"); |
1041 | return -EIO; | 1041 | return -EIO; |
1042 | } else if (result == TOS_NOT_SUPPORTED) { | 1042 | } else if (result == TOS_NOT_SUPPORTED) { |
1043 | pr_info("USB Sleep and Charge not supported\n"); | 1043 | pr_info("Sleep and Music not supported\n"); |
1044 | return -ENODEV; | 1044 | return -ENODEV; |
1045 | } else if (result == TOS_INPUT_DATA_ERROR) { | 1045 | } else if (result == TOS_INPUT_DATA_ERROR) { |
1046 | return -EIO; | 1046 | return -EIO; |