diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /drivers/input/joystick | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index 105112fb7b57..80cdebcbcb99 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c | |||
| @@ -178,9 +178,9 @@ static int iforce_usb_probe(struct usb_interface *intf, | |||
| 178 | 178 | ||
| 179 | fail: | 179 | fail: |
| 180 | if (iforce) { | 180 | if (iforce) { |
| 181 | if (iforce->irq) usb_free_urb(iforce->irq); | 181 | usb_free_urb(iforce->irq); |
| 182 | if (iforce->out) usb_free_urb(iforce->out); | 182 | usb_free_urb(iforce->out); |
| 183 | if (iforce->ctrl) usb_free_urb(iforce->ctrl); | 183 | usb_free_urb(iforce->ctrl); |
| 184 | kfree(iforce); | 184 | kfree(iforce); |
| 185 | } | 185 | } |
| 186 | 186 | ||