Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / net / ethernet / stmicro / stmmac / dwmac-meson8b.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
index 9cda29e4b89d53af56eaa39565a56bec2d9d5aaa..306da8f6b7d541d4d2d3656f77a911f3237a2eb4 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
@@ -339,7 +339,7 @@ static int meson8b_dwmac_probe(struct platform_device *pdev)
 
        dwmac->dev = &pdev->dev;
        dwmac->phy_mode = of_get_phy_mode(pdev->dev.of_node);
-       if (dwmac->phy_mode < 0) {
+       if ((int)dwmac->phy_mode < 0) {
                dev_err(&pdev->dev, "missing phy-mode property\n");
                ret = -EINVAL;
                goto err_remove_config_dt;