From 9c0e31321c29f2f8a84a7e3b7f31d89b2422457b Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Wed, 8 Nov 2006 15:35:58 +0100 Subject: [PATCH] --- yaml --- r: 41291 b: refs/heads/master c: 4ba0b2ed583b80cb26b9c8d8a8b418f677ec4a83 h: refs/heads/master i: 41289: 94bc4cdfa3382a6b217fa86618a52643801e7ca5 41287: fc1af2a7da922fee759576d224a36be7968764ed v: v3 --- [refs] | 2 +- trunk/drivers/usb/input/usbkbd.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 593d076b92ef..adc479ebeb34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f07429fa295a04e06c93601e6c597e7a6d95495 +refs/heads/master: 4ba0b2ed583b80cb26b9c8d8a8b418f677ec4a83 diff --git a/trunk/drivers/usb/input/usbkbd.c b/trunk/drivers/usb/input/usbkbd.c index b6c2ba7e05a4..dac88640eab6 100644 --- a/trunk/drivers/usb/input/usbkbd.c +++ b/trunk/drivers/usb/input/usbkbd.c @@ -208,10 +208,8 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd) static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd) { - if (kbd->irq) - usb_free_urb(kbd->irq); - if (kbd->led) - usb_free_urb(kbd->led); + usb_free_urb(kbd->irq); + usb_free_urb(kbd->led); if (kbd->new) usb_buffer_free(dev, 8, kbd->new, kbd->new_dma); if (kbd->cr)