diff --git a/[refs] b/[refs] index 13d112da3e15..268e48cfcbf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 268b06ac8b3b16516cf926872d822836caf785cc +refs/heads/master: c6a241745943aba2b86b9dae3258e60f4c6635a8 diff --git a/trunk/drivers/staging/wlags49_h2/wl_wext.c b/trunk/drivers/staging/wlags49_h2/wl_wext.c index 764a3208afda..89563dadddcd 100644 --- a/trunk/drivers/staging/wlags49_h2/wl_wext.c +++ b/trunk/drivers/staging/wlags49_h2/wl_wext.c @@ -1214,7 +1214,6 @@ static int wireless_set_encode(struct net_device *dev, struct iw_request_info *i lp->EnableEncryption = 1; } else { DBG_WARNING( DbgInfo, "Problem setting the current TxKey\n" ); - DBG_LEAVE( DbgInfo ); ret = -EINVAL; } }