diff options
| author |   Hariprasad Kelam <hariprasad.kelam@gmail.com> | 2019-05-12 16:23:45 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-20 07:40:37 +0200 |
| commit | f0f74b45d64dff40e5dff87e160be20cd96dc1d8 (patch) | |
| tree | 51bdbaafacba09f2a43d68fe0aeb1f59b8f94488 /drivers | |
| parent | Linux 5.2-rc1 (diff) | |
| download | linux-dev-f0f74b45d64dff40e5dff87e160be20cd96dc1d8.tar.xz linux-dev-f0f74b45d64dff40e5dff87e160be20cd96dc1d8.zip | |
drivers: staging : wlan-ng : collect return status without variable
As caller rdev_set_default_key not particular about -EFAULT.
We can preserve the return value of prism2_domibset_uint32.
Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
----
Changes in v2:
- remove masking of original return value with EFAULT
Changes in v3:
- merge patch v1 and v2 sothat it can be applied on linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/wlan-ng/cfg80211.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index 8a862f718d5c..eee1998c4b18 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -231,17 +231,9 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev, { struct wlandevice *wlandev = dev->ml_priv; - int err = 0; - int result = 0; - - result = prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID, - key_index); - - if (result) - err = -EFAULT; - - return err; + return prism2_domibset_uint32(wlandev, + DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID, + key_index); } static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, |