Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3f78a28037c65b92d2717b7787902a853c2506a4

Authored by Hans de Goede
Committed by Marek Vasut
1 parent 6e78c74f62
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

usb: kbd: Remove check for already being registered 

We now always properly deregister the keyboard before calling
drv_usb_kbd_init(), so we can drop the check for already being registered.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Showing 1 changed file with 1 additions and 11 deletions Side-by-side Diff

... ... @@ -490,7 +490,7 @@
490 490 /* Search for keyboard and register it if found. */
491 491 int drv_usb_kbd_init(void)
492 492 {
493   - struct stdio_dev usb_kbd_dev, *old_dev;
  493 + struct stdio_dev usb_kbd_dev;
494 494 struct usb_device *dev;
495 495 char *stdinname = getenv("stdin");
496 496 int error, i;
... ... @@ -508,16 +508,6 @@
508 508 /* Try probing the keyboard */
509 509 if (usb_kbd_probe(dev, 0) != 1)
510 510 continue;
511   -
512   - /* We found a keyboard, check if it is already registered. */
513   - debug("USB KBD: found set up device.\n");
514   - old_dev = stdio_get_by_name(DEVNAME);
515   - if (old_dev) {
516   - /* Already registered, just return ok. */
517   - debug("USB KBD: is already registered.\n");
518   - usb_kbd_deregister();
519   - return 1;
520   - }
521 511  
522 512 /* Register the keyboard */
523 513 debug("USB KBD: register.\n");