From d1ba04cc0fff504a6d7dd9bb4621cca911aeb29c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Tue, 29 Nov 2005 02:59:27 -0500
Subject: [PATCH] --- yaml --- r: 14895 b: refs/heads/master c:
 c08ad1e304061dbd6ef7545d8f2db530b43c0fbd h: refs/heads/master i:   14893:
 83302be1a79dc3a158f194e4b843b7037afb6a18   14891:
 b972c337ccf9b2a35ad156b48dc21dd5239124c1   14887:
 3061fb58a69b043fa6e0ced49239be04c9400457   14879:
 ee0652ae9575c451cbcdf2e949a797881655917b v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/orinoco.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 469041f18ce5..ffa910571c43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee7ebdf40260c6c5586f20cda5d253bc988e7baa
+refs/heads/master: c08ad1e304061dbd6ef7545d8f2db530b43c0fbd
diff --git a/trunk/drivers/net/wireless/orinoco.c b/trunk/drivers/net/wireless/orinoco.c
index 488ab06fb79f..6fd0bf736830 100644
--- a/trunk/drivers/net/wireless/orinoco.c
+++ b/trunk/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;