diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 04:51:26 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 04:51:26 -0500 |
commit | 62d65a8062530a4b2673999deb9be368fa60ca87 (patch) | |
tree | 89ccd9b8de02b247f145275311378280ae26cdfb /drivers/net/wireless/orinoco.c | |
parent | f89b23217372ed9bdba8804c1616d445402d1e05 (diff) | |
parent | ea182d4aefa3a27847d890b1592a608d1180aa45 (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wireless/orinoco.c')
-rw-r--r-- | drivers/net/wireless/orinoco.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 488ab06fb79..6fd0bf73683 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c @@ -3512,9 +3512,8 @@ static int orinoco_ioctl_setpower(struct net_device *dev, break; default: err = -EINVAL; - } - if (err) goto out; + } if (prq->flags & IW_POWER_TIMEOUT) { priv->pm_on = 1; |