From 3608c1d4860471450827784ae01abfb2321f488f Mon Sep 17 00:00:00 2001 From: Wang Chen Date: Mon, 8 Dec 2008 01:13:25 -0800 Subject: [PATCH] --- yaml --- r: 122550 b: refs/heads/master c: 5a001a070e032bea1be563b13ebf9819cd5e54d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/linux/wbusb.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ca2bcf2be73..04f5a57ab39b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bcd42679643dd3dfd6aaad9fcbcc74ac5c7e2e9 +refs/heads/master: 5a001a070e032bea1be563b13ebf9819cd5e54d4 diff --git a/trunk/drivers/staging/winbond/linux/wbusb.c b/trunk/drivers/staging/winbond/linux/wbusb.c index f4a7875f2389..39ca9b9878f8 100644 --- a/trunk/drivers/staging/winbond/linux/wbusb.c +++ b/trunk/drivers/staging/winbond/linux/wbusb.c @@ -336,7 +336,11 @@ WbUsb_destroy(phw_data_t pHwData) int wb35_open(struct net_device *netdev) { - PADAPTER Adapter = (PADAPTER)netdev->priv; + /* netdev_priv() or netdev->ml_priv should reference to the address of + * private data(PADAPTER). It depends on whether private data memory is + * allocated when alloc_netdev(). + */ + PADAPTER Adapter = (PADAPTER)netdev_priv(netdev); phw_data_t pHwData = &Adapter->sHwData; netif_start_queue(netdev);