diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2010-05-09 22:10:02 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-05 11:15:33 -0700 |
| commit | 9541a0328b9c28709b7ee77e0412fd3984ea8642 (patch) | |
| tree | 0cbfe623118b63765981d1dd6147138f0351bb4d /drivers | |
| parent | 78d395a26eb5fd802b846d7bf5afe3a64a5ddb63 (diff) | |
| download | kernel-crypto-9541a0328b9c28709b7ee77e0412fd3984ea8642.tar.gz kernel-crypto-9541a0328b9c28709b7ee77e0412fd3984ea8642.tar.xz kernel-crypto-9541a0328b9c28709b7ee77e0412fd3984ea8642.zip | |
staging: vt6655: Fix kernel BUG on driver wpa initialization
commit f65515275ea3e45fdcd0fb78455f542d6fdca086 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 0db8d7b6e79..433c403d55f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1089,11 +1089,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; |