Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HID: sony: Perform duplicate device check earlier on

Browse Source 
Game controllers can be connected twice through USB and BT. Only
one connection is allowed. Currently we perform a check for duplicate
controllers halfway through device initialization. To prevent
'transient' devices, we should do this check as early as we can.

Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Roderick Colenbrander 2017-03-07 15:45:11 -08:00 committed by Jiri Kosina
parent 510c8b7c16
commit df848bc05d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hid/hid-sony.c
View File

@ -2477,6 +2477,10 @@ static int sony_input_configured(struct hid_device *hdev,
goto err_stop;
}
ret = append_dev_id = sony_check_add(sc);
if (ret < 0)
goto err_stop;
ret = sony_allocate_output_report(sc);
if (ret < 0) {
hid_err(hdev, "failed to allocate the output report buffer\n");
@ -2610,10 +2614,6 @@ static int sony_input_configured(struct hid_device *hdev,
ret = 0;
}
if (ret < 0)
goto err_stop;
ret = append_dev_id = sony_check_add(sc);
if (ret < 0)
goto err_stop;