OSDN Git Service

Merge 5.1-rc3 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:42:04 +0000 (07:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:42:04 +0000 (07:42 +0200)
We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/common/common.c
drivers/usb/core/hcd.c
drivers/usb/host/u132-hcd.c
drivers/usb/typec/tcpm/wcove.c

Simple merge
Simple merge
@@@ -3203,9 -3203,10 +3203,12 @@@ static int __init u132_hcd_init(void
                return -ENODEV;
        printk(KERN_INFO "driver %s\n", hcd_name);
        workqueue = create_singlethread_workqueue("u132");
 +      if (!workqueue)
 +              return -ENOMEM;
        retval = platform_driver_register(&u132_platform_driver);
+       if (retval)
+               destroy_workqueue(workqueue);
        return retval;
  }
  
Simple merge