From c980aab62e6d4806f7b9f36117f32f9d9485f8c2 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 3 May 2007 01:04:52 -0400 Subject: [PATCH] --- yaml --- r: 55983 b: refs/heads/master c: 6675c5bd2a0ec223888b42cf97bc7dc900bf31fb h: refs/heads/master i: 55981: 6c79dbc948284d50eaa2f22a652ad928488343bf 55979: db1701742fc763459bfd438def9dfc5c52aa09cc 55975: 9a4a4b20db2c8d631c171bb8c19a4dd26aba640f 55967: 0b8d7126249a830652c75bf66b5a541802067f1a v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/hid-core.c | 12 ++++-------- trunk/drivers/hid/usbhid/usbkbd.c | 9 +++------ 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index a1ee90894aed..b953d4debd1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66da876962f782a3974b4a957d12f20656584a4d +refs/heads/master: 6675c5bd2a0ec223888b42cf97bc7dc900bf31fb diff --git a/trunk/drivers/hid/usbhid/hid-core.c b/trunk/drivers/hid/usbhid/hid-core.c index 1c0bd481219c..d06b9e70ce6a 100644 --- a/trunk/drivers/hid/usbhid/hid-core.c +++ b/trunk/drivers/hid/usbhid/hid-core.c @@ -626,14 +626,10 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid) { struct usbhid_device *usbhid = hid->driver_data; - if (usbhid->inbuf) - usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma); - if (usbhid->outbuf) - usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma); - if (usbhid->cr) - usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma); - if (usbhid->ctrlbuf) - usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma); + usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma); + usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma); + usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma); + usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma); } /* diff --git a/trunk/drivers/hid/usbhid/usbkbd.c b/trunk/drivers/hid/usbhid/usbkbd.c index 65aa12e8d7b3..36ddc7a7a427 100644 --- a/trunk/drivers/hid/usbhid/usbkbd.c +++ b/trunk/drivers/hid/usbhid/usbkbd.c @@ -211,12 +211,9 @@ static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd) { 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) - usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma); - if (kbd->leds) - usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma); + usb_buffer_free(dev, 8, kbd->new, kbd->new_dma); + usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma); + usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma); } static int usb_kbd_probe(struct usb_interface *iface,