usbkbd.c (446279168e030fd0ed68e2bba336bef8bb3da352) | usbkbd.c (eeeec27d68204701cc5d49d79f7ba811e8438109) |
---|---|
1// SPDX-License-Identifier: GPL-2.0-or-later 2/* 3 * Copyright (c) 1999-2001 Vojtech Pavlik 4 * 5 * USB HIDBP Keyboard support 6 */ 7 8/* --- 280 unchanged lines hidden (view full) --- 289 if (usb_kbd_alloc_mem(dev, kbd)) 290 goto fail2; 291 292 kbd->usbdev = dev; 293 kbd->dev = input_dev; 294 spin_lock_init(&kbd->leds_lock); 295 296 if (dev->manufacturer) | 1// SPDX-License-Identifier: GPL-2.0-or-later 2/* 3 * Copyright (c) 1999-2001 Vojtech Pavlik 4 * 5 * USB HIDBP Keyboard support 6 */ 7 8/* --- 280 unchanged lines hidden (view full) --- 289 if (usb_kbd_alloc_mem(dev, kbd)) 290 goto fail2; 291 292 kbd->usbdev = dev; 293 kbd->dev = input_dev; 294 spin_lock_init(&kbd->leds_lock); 295 296 if (dev->manufacturer) |
297 strlcpy(kbd->name, dev->manufacturer, sizeof(kbd->name)); | 297 strscpy(kbd->name, dev->manufacturer, sizeof(kbd->name)); |
298 299 if (dev->product) { 300 if (dev->manufacturer) 301 strlcat(kbd->name, " ", sizeof(kbd->name)); 302 strlcat(kbd->name, dev->product, sizeof(kbd->name)); 303 } 304 305 if (!strlen(kbd->name)) --- 93 unchanged lines hidden --- | 298 299 if (dev->product) { 300 if (dev->manufacturer) 301 strlcat(kbd->name, " ", sizeof(kbd->name)); 302 strlcat(kbd->name, dev->product, sizeof(kbd->name)); 303 } 304 305 if (!strlen(kbd->name)) --- 93 unchanged lines hidden --- |