2 files changed, 11 insertions, 0 deletions

diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 1d6bf0a28cec..08139030954f 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -336,6 +336,12 @@ int generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf)
                 dev->hard_mtu, tmp, dev->rx_urb_size,
                 1 << le32_to_cpu(u.init_c->packet_alignment));
 
+        /* module has some device initialization code needs to be done right
+         * after RNDIS_INIT */
+        if (dev->driver_info->early_init &&
+                        dev->driver_info->early_init(dev) != 0)
+                goto halt_fail_and_release;
+
         /* Get designated host ethernet address */
         reply_len = ETH_ALEN;
         retval = rndis_query(dev, intf, u.buf, OID_802_3_PERMANENT_ADDRESS,
diff --git a/drivers/net/usb/usbnet.h b/drivers/net/usb/usbnet.h
index 0b4bf09fc8b1..25b63d3339dc 100644
--- a/drivers/net/usb/usbnet.h
+++ b/drivers/net/usb/usbnet.h
@@ -116,6 +116,11 @@ struct driver_info {
         struct sk_buff  *(*tx_fixup)(struct usbnet *dev,
                                 struct sk_buff *skb, gfp_t flags);
 
+        /* early initialization code, can sleep. This is for minidrivers
+         * having 'subminidrivers' that need to do extra initialization
+         * right after minidriver have initialized hardware. */
+        int     (*early_init)(struct usbnet *dev);
+
         /* for new devices, use the descriptor-reading code instead */
         int             in;             /* rx endpoint */
         int             out;            /* tx endpoint */