Patchwork net: stmmac: fixed operator typo

login
register
mail settings
Submitter Byungho An
Date June 28, 2013, 7:35 a.m.
Message ID <015701ce73d2$117b9040$3472b0c0$%an@samsung.com>
Download mbox | patch
Permalink /patch/255284/
State Accepted
Delegated to: David Miller
Headers show

Comments

Byungho An - June 28, 2013, 7:35 a.m.
This patch fixed operator typo from & to ==.
Due to incorrect operator, the result is incorrect.

Signed-off-by: Byungho An <bh74.an@samsung.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   22 +++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
Giuseppe CAVALLARO - June 28, 2013, 12:59 p.m.
On 6/28/2013 9:35 AM, Byungho An wrote:
> 
> This patch fixed operator typo from & to ==.
> Due to incorrect operator, the result is incorrect.
> 
> Signed-off-by: Byungho An <bh74.an@samsung.com>

Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>

> ---
>   drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   22 +++++++++++++--------
>   1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index c1ad5f4..f088633 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -788,13 +788,13 @@ static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
>   	int interface = priv->plat->interface;
>   
>   	if (priv->dma_cap.pcs) {
> -		if ((interface & PHY_INTERFACE_MODE_RGMII) ||
> -		    (interface & PHY_INTERFACE_MODE_RGMII_ID) ||
> -		    (interface & PHY_INTERFACE_MODE_RGMII_RXID) ||
> -		    (interface & PHY_INTERFACE_MODE_RGMII_TXID)) {
> +		if ((interface == PHY_INTERFACE_MODE_RGMII) ||
> +		    (interface == PHY_INTERFACE_MODE_RGMII_ID) ||
> +		    (interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
> +		    (interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
>   			pr_debug("STMMAC: PCS RGMII support enable\n");
>   			priv->pcs = STMMAC_PCS_RGMII;
> -		} else if (interface & PHY_INTERFACE_MODE_SGMII) {
> +		} else if (interface == PHY_INTERFACE_MODE_SGMII) {
>   			pr_debug("STMMAC: PCS SGMII support enable\n");
>   			priv->pcs = STMMAC_PCS_SGMII;
>   		}
> 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - July 1, 2013, 8:33 p.m.
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Fri, 28 Jun 2013 14:59:36 +0200

> On 6/28/2013 9:35 AM, Byungho An wrote:
>> 
>> This patch fixed operator typo from & to ==.
>> Due to incorrect operator, the result is incorrect.
>> 
>> Signed-off-by: Byungho An <bh74.an@samsung.com>
> 
> Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index c1ad5f4..f088633 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -788,13 +788,13 @@  static void stmmac_check_pcs_mode(struct stmmac_priv *priv)
 	int interface = priv->plat->interface;
 
 	if (priv->dma_cap.pcs) {
-		if ((interface & PHY_INTERFACE_MODE_RGMII) ||
-		    (interface & PHY_INTERFACE_MODE_RGMII_ID) ||
-		    (interface & PHY_INTERFACE_MODE_RGMII_RXID) ||
-		    (interface & PHY_INTERFACE_MODE_RGMII_TXID)) {
+		if ((interface == PHY_INTERFACE_MODE_RGMII) ||
+		    (interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+		    (interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+		    (interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
 			pr_debug("STMMAC: PCS RGMII support enable\n");
 			priv->pcs = STMMAC_PCS_RGMII;
-		} else if (interface & PHY_INTERFACE_MODE_SGMII) {
+		} else if (interface == PHY_INTERFACE_MODE_SGMII) {
 			pr_debug("STMMAC: PCS SGMII support enable\n");
 			priv->pcs = STMMAC_PCS_SGMII;
 		}