---

yaml --- r: 304756 b: refs/heads/master c: 54bc1ff h: refs/heads/master v: v3
git-mirror · May 17, 2012 · c32bb19 · c32bb19
1 parent d71971e
commit c32bb19
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3080b838158f1b17bd806c3fd7b9086ba3054a04
+refs/heads/master: 54bc1ff1daa86353ab07191b7fdde05e6b3844b1
diff --git a/trunk/drivers/staging/gdm72xx/gdm_sdio.c b/trunk/drivers/staging/gdm72xx/gdm_sdio.c
@@ -618,7 +618,7 @@ static void gdm_sdio_irq(struct sdio_func *func)
 done:
 	sdio_writeb(func, 0x00, 0x10, &ret);	/* PCRRT */
 	if (!phy_dev->netdev)
-		register_wimax_device(phy_dev);
+		register_wimax_device(phy_dev, &func->dev);
 }
 
 static int gdm_sdio_receive(void *priv_dev,

diff --git a/trunk/drivers/staging/gdm72xx/gdm_usb.c b/trunk/drivers/staging/gdm72xx/gdm_usb.c
@@ -624,7 +624,7 @@ static int gdm_usb_probe(struct usb_interface *intf,
 	INIT_WORK(&udev->pm_ws, do_pm_control);
 #endif /* CONFIG_WIMAX_GDM72XX_USB_PM */
 
-	ret = register_wimax_device(phy_dev);
+	ret = register_wimax_device(phy_dev, &intf->dev);
 
 out:
 	if (ret) {

diff --git a/trunk/drivers/staging/gdm72xx/gdm_wimax.c b/trunk/drivers/staging/gdm72xx/gdm_wimax.c
@@ -943,7 +943,7 @@ static struct net_device_ops gdm_netdev_ops = {
 	.ndo_do_ioctl			= gdm_wimax_ioctl,
 };
 
-int register_wimax_device(struct phy_dev *phy_dev)
+int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev)
 {
 	struct nic *nic = NULL;
 	struct net_device *dev;
@@ -957,6 +957,7 @@ int register_wimax_device(struct phy_dev *phy_dev)
 		return -ENOMEM;
 	}
 
+	SET_NETDEV_DEV(dev, pdev);
 	dev->mtu = 1400;
 	dev->netdev_ops = &gdm_netdev_ops;
 	dev->flags &= ~IFF_MULTICAST;

diff --git a/trunk/drivers/staging/gdm72xx/gdm_wimax.h b/trunk/drivers/staging/gdm72xx/gdm_wimax.h
@@ -85,7 +85,7 @@ struct nic {
 
 /*#define LOOPBACK_TEST */
 
-extern int register_wimax_device(struct phy_dev *phy_dev);
+extern int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev);
 extern int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev);
 extern void unregister_wimax_device(struct phy_dev *phy_dev);