diff options
-rw-r--r-- | drivers/input/joystick/xpad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 83811e45d633..3d8f39b68844 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -235,7 +235,7 @@ static const signed short xpad_abs_triggers[] = { | |||
235 | { XPAD_XBOX360_VENDOR_PROTOCOL(vend,1) }, \ | 235 | { XPAD_XBOX360_VENDOR_PROTOCOL(vend,1) }, \ |
236 | { XPAD_XBOX360_VENDOR_PROTOCOL(vend,129) } | 236 | { XPAD_XBOX360_VENDOR_PROTOCOL(vend,129) } |
237 | 237 | ||
238 | static struct usb_device_id xpad_table [] = { | 238 | static struct usb_device_id xpad_table[] = { |
239 | { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ | 239 | { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ |
240 | XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ | 240 | XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ |
241 | XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ | 241 | XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ |
@@ -251,7 +251,7 @@ static struct usb_device_id xpad_table [] = { | |||
251 | { } | 251 | { } |
252 | }; | 252 | }; |
253 | 253 | ||
254 | MODULE_DEVICE_TABLE (usb, xpad_table); | 254 | MODULE_DEVICE_TABLE(usb, xpad_table); |
255 | 255 | ||
256 | struct usb_xpad { | 256 | struct usb_xpad { |
257 | struct input_dev *dev; /* input device interface */ | 257 | struct input_dev *dev; /* input device interface */ |
@@ -783,7 +783,7 @@ static int xpad_open(struct input_dev *dev) | |||
783 | struct usb_xpad *xpad = input_get_drvdata(dev); | 783 | struct usb_xpad *xpad = input_get_drvdata(dev); |
784 | 784 | ||
785 | /* URB was submitted in probe */ | 785 | /* URB was submitted in probe */ |
786 | if(xpad->xtype == XTYPE_XBOX360W) | 786 | if (xpad->xtype == XTYPE_XBOX360W) |
787 | return 0; | 787 | return 0; |
788 | 788 | ||
789 | xpad->irq_in->dev = xpad->udev; | 789 | xpad->irq_in->dev = xpad->udev; |