diff --git a/[refs] b/[refs]
index 42716e17b4cf..c9cabf50aa46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c97c894dc7bcae28d0308dbcd010185079de4a28
+refs/heads/master: 324dd96d2b022595b9fc8f24305b3ab770cc63b9
diff --git a/trunk/drivers/net/qlge/qlge_ethtool.c b/trunk/drivers/net/qlge/qlge_ethtool.c
index 19b00fa0eaf0..9b67bfea035f 100644
--- a/trunk/drivers/net/qlge/qlge_ethtool.c
+++ b/trunk/drivers/net/qlge/qlge_ethtool.c
@@ -650,8 +650,6 @@ static int ql_set_pauseparam(struct net_device *netdev,
 		return -EINVAL;
 
 	status = ql_mb_set_port_cfg(qdev);
-	if (status)
-		return status;
 	return status;
 }