From 68674c816192d9461e36d06a2b75b352e725b316 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Thu, 13 Sep 2012 15:01:39 +0530 Subject: [PATCH] --- yaml --- r: 325271 b: refs/heads/master c: 5d6f5054e8ee9af23db3df4471cd3c30d5f2fadc h: refs/heads/master i: 325269: 6b1beb7441b0fa6c30ac0467ae790fedfcf79a80 325267: fdeed29a39659d771eec8d61f8e5c03d9169bba4 325263: dd1db98d97f8e85a4efdedb6f023a8a6780dbe73 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/prism2sta.c | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index d823c62ac99b..ff0c594ff93c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b970b2d308c61983609a789785d32d01a2dec26 +refs/heads/master: 5d6f5054e8ee9af23db3df4471cd3c30d5f2fadc diff --git a/trunk/drivers/staging/wlan-ng/prism2sta.c b/trunk/drivers/staging/wlan-ng/prism2sta.c index 37f183d21ed0..8d2277bb898f 100644 --- a/trunk/drivers/staging/wlan-ng/prism2sta.c +++ b/trunk/drivers/staging/wlan-ng/prism2sta.c @@ -1211,7 +1211,7 @@ void prism2sta_processing_defer(struct work_struct *data) /* Now let's handle the linkstatus stuff */ if (hw->link_status == hw->link_status_new) - goto failed; + return; hw->link_status = hw->link_status_new; @@ -1265,7 +1265,7 @@ void prism2sta_processing_defer(struct work_struct *data) pr_debug ("getconfig(0x%02x) failed, result = %d\n", HFA384x_RID_CURRENTBSSID, result); - goto failed; + return; } result = hfa384x_drvr_getconfig(hw, @@ -1275,7 +1275,7 @@ void prism2sta_processing_defer(struct work_struct *data) pr_debug ("getconfig(0x%02x) failed, result = %d\n", HFA384x_RID_CURRENTSSID, result); - goto failed; + return; } prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid, (p80211pstrd_t *) & @@ -1289,7 +1289,7 @@ void prism2sta_processing_defer(struct work_struct *data) pr_debug ("getconfig(0x%02x) failed, result = %d\n", HFA384x_RID_PORTSTATUS, result); - goto failed; + return; } wlandev->macmode = (portstatus == HFA384x_PSTATUS_CONN_IBSS) ? @@ -1348,7 +1348,7 @@ void prism2sta_processing_defer(struct work_struct *data) if (result) { pr_debug("getconfig(0x%02x) failed, result = %d\n", HFA384x_RID_CURRENTBSSID, result); - goto failed; + return; } result = hfa384x_drvr_getconfig(hw, @@ -1357,7 +1357,7 @@ void prism2sta_processing_defer(struct work_struct *data) if (result) { pr_debug("getconfig(0x%02x) failed, result = %d\n", HFA384x_RID_CURRENTSSID, result); - goto failed; + return; } prism2mgmt_bytestr2pstr((hfa384x_bytestr_t *) &ssid, (p80211pstrd_t *) &wlandev->ssid); @@ -1436,14 +1436,10 @@ void prism2sta_processing_defer(struct work_struct *data) /* This is bad, IO port problems? */ printk(KERN_WARNING "unknown linkstatus=0x%02x\n", hw->link_status); - goto failed; - break; + return; } wlandev->linkstatus = (hw->link_status == HFA384x_LINK_CONNECTED); - -failed: - return; } /*----------------------------------------------------------------