diff options
| author | Roderick Colenbrander <roderick.colenbrander@sony.com> | 2017-03-07 15:45:09 -0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-03-21 15:12:07 +0100 |
| commit | 80ecc48c0ade5e99cc9d84febd17c44a4f011c13 (patch) | |
| tree | b2ac74780bea5cb2099b2c723a1cca33642c9209 /drivers/hid/hid-sony.c | |
| parent | e19a267b9987135c00155a51e683e434b9abb56b (diff) | |
| download | linux-stable-80ecc48c0ade5e99cc9d84febd17c44a4f011c13.tar.gz linux-stable-80ecc48c0ade5e99cc9d84febd17c44a4f011c13.tar.bz2 linux-stable-80ecc48c0ade5e99cc9d84febd17c44a4f011c13.zip | |
HID: sony: Print error on failure to active DS3 / Navigation controllers
This patch adds printing when we failed to activate DS3 / Nagivation
controllers and checks the return value for these failures earlier
in sony_input_configured. This paves the way for other configuration
logic for these devices, which we don't want to call if for example
the activation failed.
Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-sony.c')
| -rw-r--r-- | drivers/hid/hid-sony.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index b1a21ba4263a..fa2ea085fec8 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -2468,7 +2468,13 @@ static int sony_input_configured(struct hid_device *hdev, hdev->quirks |= HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP; hdev->quirks |= HID_QUIRK_SKIP_OUTPUT_REPORT_ID; sc->defer_initialization = 1; + ret = sixaxis_set_operational_usb(hdev); + if (ret < 0) { + hid_err(hdev, "Failed to set controller into operational mode\n"); + goto err_stop; + } + sony_init_output_report(sc, sixaxis_send_output_report); } else if ((sc->quirks & SIXAXIS_CONTROLLER_BT) || (sc->quirks & NAVIGATION_CONTROLLER_BT)) { @@ -2477,7 +2483,13 @@ static int sony_input_configured(struct hid_device *hdev, * when connected via Bluetooth. */ hdev->quirks |= HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP; + ret = sixaxis_set_operational_bt(hdev); + if (ret < 0) { + hid_err(hdev, "Failed to set controller into operational mode\n"); + goto err_stop; + } + sony_init_output_report(sc, sixaxis_send_output_report); } else if (sc->quirks & DUALSHOCK4_CONTROLLER) { ret = dualshock4_get_calibration_data(sc); |