1 files changed, 21 insertions, 2 deletions

diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index a52404a1aef..51d572eae9a 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -765,6 +765,26 @@ static struct device_type gadget_type = {
  */
 int gether_setup(struct usb_gadget *g, u8 ethaddr[ETH_ALEN])
 {
+        return gether_setup_name(g, ethaddr, "usb");
+}
+
+/**
+ * gether_setup_name - initialize one ethernet-over-usb link
+ * @g: gadget to associated with these links
+ * @ethaddr: NULL, or a buffer in which the ethernet address of the
+ *      host side of the link is recorded
+ * @netname: name for network device (for example, "usb")
+ * Context: may sleep
+ *
+ * This sets up the single network link that may be exported by a
+ * gadget driver using this framework.  The link layer addresses are
+ * set up using module parameters.
+ *
+ * Returns negative errno, or zero on success
+ */
+int gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
+                const char *netname)
+{
         struct eth_dev          *dev;
         struct net_device       *net;
         int                     status;
@@ -787,7 +807,7 @@ int gether_setup(struct usb_gadget *g, u8 ethaddr[ETH_ALEN])
 
         /* network device setup */
         dev->net = net;
-        strcpy(net->name, "usb%d");
+        snprintf(net->name, sizeof(net->name), "%s%%d", netname);
 
         if (get_ether_addr(dev_addr, net->dev_addr))
                 dev_warn(&g->dev,
@@ -943,7 +963,6 @@ void gether_disconnect(struct gether *link)
         struct eth_dev          *dev = link->ioport;
         struct usb_request      *req;
 
-        WARN_ON(!dev);
         if (!dev)
                 return;