diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-07-21 18:10:54 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-21 18:10:54 -0700 |
| commit | 0e4ec5c1011bf87326168a9b51bf22852747bf93 (patch) | |
| tree | 847f9364b5ba711d4949a54d9657d60294799a00 /drivers/net/wireless/bcm4329/dhd_linux.c | |
| parent | d6348a53b9f9d776358b7261dfcdab06ffeafc78 (diff) | |
| parent | 5d89db9f307306cae7a356c8af44e12fefdc87e9 (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'drivers/net/wireless/bcm4329/dhd_linux.c')
| -rw-r--r-- | drivers/net/wireless/bcm4329/dhd_linux.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm4329/dhd_linux.c b/drivers/net/wireless/bcm4329/dhd_linux.c index c2d6587f30a..5c1384bdc21 100644 --- a/drivers/net/wireless/bcm4329/dhd_linux.c +++ b/drivers/net/wireless/bcm4329/dhd_linux.c @@ -1941,6 +1941,9 @@ dhd_open(struct net_device *net) ifidx = dhd_net2idx(dhd, net); DHD_TRACE(("%s: ifidx %d\n", __FUNCTION__, ifidx)); + if (ifidx == DHD_BAD_IF) + return -1; + if ((dhd->iflist[ifidx]) && (dhd->iflist[ifidx]->state == WLC_E_IF_DEL)) { DHD_ERROR(("%s: Error: called when IF already deleted\n", __FUNCTION__)); return -1; |