Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream backports for hid-sony.c #13

Closed
wants to merge 5 commits into from
Closed

Upstream backports for hid-sony.c #13

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cf9762
HID: sony: Fix a WARNING shown when rmmod-ing the driver
ao2 Feb 16, 2015
cefc7b0
HID: sony: Use the minimum accepted size for feature report 0xf2
ao2 Feb 16, 2015
01147f0
HID: sony: Don't use magic constants in sixaxis_set_operational_usb().
Feb 19, 2015
4bb46ec
HID: sony: Enable GASIA third party controllers.
Feb 19, 2015
bac01eb
HID: sony: Fix uninitialized spinlocks
Feb 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions drivers/hid/hid-sony.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,9 +803,10 @@ union sixaxis_output_report_01 {
#define DS4_REPORT_0x05_SIZE 32
#define DS4_REPORT_0x11_SIZE 78
#define DS4_REPORT_0x81_SIZE 7
#define SIXAXIS_REPORT_0xF2_SIZE 18
#define SIXAXIS_REPORT_0xF2_SIZE 17
#define SIXAXIS_REPORT_0xF5_SIZE 8

static spinlock_t sony_dev_list_lock;
static DEFINE_SPINLOCK(sony_dev_list_lock);
static LIST_HEAD(sony_device_list);
static DEFINE_IDA(sony_device_id_allocator);

Expand Down Expand Up @@ -1187,20 +1188,50 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
struct usb_device *dev = interface_to_usbdev(intf);
__u16 ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
int ret;
char *buf = kmalloc(18, GFP_KERNEL);
int transferred;
const int buf_size = max(SIXAXIS_REPORT_0xF2_SIZE,
SIXAXIS_REPORT_0xF5_SIZE);
__u8 *buf;

buf = kmalloc(buf_size, GFP_KERNEL);
if (!buf)
return -ENOMEM;

ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
HID_REQ_GET_REPORT,
USB_DIR_IN | USB_TYPE_CLASS |
USB_RECIP_INTERFACE,
(3 << 8) | 0xf2, ifnum, buf, 17,
(3 << 8) | 0xf2, ifnum, buf,
SIXAXIS_REPORT_0xF2_SIZE,
USB_CTRL_GET_TIMEOUT);
if (ret < 0) {
hid_err(hdev, "can't set operational mode: step 1\n");
goto out;
}

/*
* Some compatible controllers like the Speedlink Strike FX and
* Gasia need another query plus an USB interrupt to get operational.
*/
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
HID_REQ_GET_REPORT,
USB_DIR_IN | USB_TYPE_CLASS |
USB_RECIP_INTERFACE,
(3 << 8) | 0xf5, ifnum, buf,
SIXAXIS_REPORT_0xF5_SIZE,
USB_CTRL_GET_TIMEOUT);
if (ret < 0) {
hid_err(hdev, "can't set operational mode: step 2\n");
goto out;
}

buf[0] = 0x00;
ret = usb_interrupt_msg(dev, usb_sndintpipe(dev, 0x02),
buf, 1, &transferred, USB_CTRL_SET_TIMEOUT);
if (ret < 0)
hid_err(hdev, "can't set operational mode\n");
hid_err(hdev, "can't set operational mode: step 3\n");

out:
kfree(buf);

return ret;
Expand Down Expand Up @@ -2042,6 +2073,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
return -ENOMEM;
}

spin_lock_init(&sc->lock);

sc->quirks = quirks;
hid_set_drvdata(hdev, sc);
sc->hdev = hdev;
Expand Down Expand Up @@ -2224,8 +2257,8 @@ static void __exit sony_exit(void)
{
dbg_hid("Sony:%s\n", __func__);

ida_destroy(&sony_device_id_allocator);
hid_unregister_driver(&sony_driver);
ida_destroy(&sony_device_id_allocator);
}
module_init(sony_init);
module_exit(sony_exit);
Expand Down