Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 488ab06fb7..6fd0bf7368 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;