diff --git a/[refs] b/[refs]
index ccf31f573049..fec03c9afee9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be36cacdddcc119ef7b33ae0b91631c3535a75ca
+refs/heads/master: a3ad38e87eead6ce748c6e4eec0571ce53b5a0c2
diff --git a/trunk/drivers/net/wireless/orinoco/cfg.c b/trunk/drivers/net/wireless/orinoco/cfg.c
index 09fae2f0ea08..736bbb9bd1d0 100644
--- a/trunk/drivers/net/wireless/orinoco/cfg.c
+++ b/trunk/drivers/net/wireless/orinoco/cfg.c
@@ -153,6 +153,9 @@ static int orinoco_scan(struct wiphy *wiphy, struct net_device *dev,
 	priv->scan_request = request;
 
 	err = orinoco_hw_trigger_scan(priv, request->ssids);
+	/* On error the we aren't processing the request */
+	if (err)
+		priv->scan_request = NULL;
 
 	return err;
 }