Commit 4cbf8aa7 authored by Lee Jones's avatar Lee Jones Committed by Benjamin Tissoires

HID: usbhid: Repair a formatting issue in a struct description

Fixes the following W=1 kernel build warning(s):

 drivers/hid/usbhid/usbkbd.c:66: warning: bad line:                 should be on

Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: message to <vojtech@ucw.cz>
Cc: linux-usb@vger.kernel.org
Cc: linux-input@vger.kernel.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 69aea9d2
...@@ -63,7 +63,7 @@ static const unsigned char usb_kbd_keycode[256] = { ...@@ -63,7 +63,7 @@ static const unsigned char usb_kbd_keycode[256] = {
* new key is pressed or a key that was pressed is released. * new key is pressed or a key that was pressed is released.
* @led: URB for sending LEDs (e.g. numlock, ...) * @led: URB for sending LEDs (e.g. numlock, ...)
* @newleds: data that will be sent with the @led URB representing which LEDs * @newleds: data that will be sent with the @led URB representing which LEDs
should be on * should be on
* @name: Name of the keyboard. @dev's name field points to this buffer * @name: Name of the keyboard. @dev's name field points to this buffer
* @phys: Physical path of the keyboard. @dev's phys field points to this * @phys: Physical path of the keyboard. @dev's phys field points to this
* buffer * buffer
...@@ -91,7 +91,7 @@ struct usb_kbd { ...@@ -91,7 +91,7 @@ struct usb_kbd {
unsigned char *leds; unsigned char *leds;
dma_addr_t new_dma; dma_addr_t new_dma;
dma_addr_t leds_dma; dma_addr_t leds_dma;
spinlock_t leds_lock; spinlock_t leds_lock;
bool led_urb_submitted; bool led_urb_submitted;
...@@ -175,15 +175,15 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type, ...@@ -175,15 +175,15 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type,
} }
*(kbd->leds) = kbd->newleds; *(kbd->leds) = kbd->newleds;
kbd->led->dev = kbd->usbdev; kbd->led->dev = kbd->usbdev;
if (usb_submit_urb(kbd->led, GFP_ATOMIC)) if (usb_submit_urb(kbd->led, GFP_ATOMIC))
pr_err("usb_submit_urb(leds) failed\n"); pr_err("usb_submit_urb(leds) failed\n");
else else
kbd->led_urb_submitted = true; kbd->led_urb_submitted = true;
spin_unlock_irqrestore(&kbd->leds_lock, flags); spin_unlock_irqrestore(&kbd->leds_lock, flags);
return 0; return 0;
} }
...@@ -205,14 +205,14 @@ static void usb_kbd_led(struct urb *urb) ...@@ -205,14 +205,14 @@ static void usb_kbd_led(struct urb *urb)
} }
*(kbd->leds) = kbd->newleds; *(kbd->leds) = kbd->newleds;
kbd->led->dev = kbd->usbdev; kbd->led->dev = kbd->usbdev;
if (usb_submit_urb(kbd->led, GFP_ATOMIC)){ if (usb_submit_urb(kbd->led, GFP_ATOMIC)){
hid_err(urb->dev, "usb_submit_urb(leds) failed\n"); hid_err(urb->dev, "usb_submit_urb(leds) failed\n");
kbd->led_urb_submitted = false; kbd->led_urb_submitted = false;
} }
spin_unlock_irqrestore(&kbd->leds_lock, flags); spin_unlock_irqrestore(&kbd->leds_lock, flags);
} }
static int usb_kbd_open(struct input_dev *dev) static int usb_kbd_open(struct input_dev *dev)
...@@ -358,9 +358,9 @@ static int usb_kbd_probe(struct usb_interface *iface, ...@@ -358,9 +358,9 @@ static int usb_kbd_probe(struct usb_interface *iface,
device_set_wakeup_enable(&dev->dev, 1); device_set_wakeup_enable(&dev->dev, 1);
return 0; return 0;
fail2: fail2:
usb_kbd_free_mem(dev, kbd); usb_kbd_free_mem(dev, kbd);
fail1: fail1:
input_free_device(input_dev); input_free_device(input_dev);
kfree(kbd); kfree(kbd);
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment