]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
staging: vt6655: Fix kernel BUG on driver wpa initialization
authorLarry Finger <Larry.Finger@lwfinger.net>
Mon, 10 May 2010 03:10:02 +0000 (22:10 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 22:54:46 +0000 (15:54 -0700)
In http://bugzilla.novell.com/show_bug.cgi?id=597299, the vt6655 driver
generates a kernel BUG on a NULL pointer dereference at NULL. This problem
has been traced to a failure in the wpa_set_wpadev() routine. As the vt6656
driver does not call this routine, the vt6655 code is similarly set to skip
the call.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Richard Meek <osl2008@googlemail.com>
Cc: Stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6655/device_main.c

index 8a63a031d00b64abdb8cb3bbf93b9167f12a71cf..7020ed41e0ca6b367485d19fc35804a81c2b7f88 100644 (file)
@@ -1091,11 +1091,13 @@ device_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
     }
 //2008-07-21-01<Add>by MikeLiu
 //register wpadev
+#if 0
    if(wpa_set_wpadev(pDevice, 1)!=0) {
      printk("Fail to Register WPADEV?\n");
         unregister_netdev(pDevice->dev);
         free_netdev(dev);
    }
+#endif
     device_print_info(pDevice);
     pci_set_drvdata(pcid, pDevice);
     return 0;