From 111bc72b6ee3ce5be53d269b2f6057960b0079c5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 18 Feb 2013 10:20:31 +0000 Subject: [PATCH] --- yaml --- r: 352787 b: refs/heads/master c: 07dcf8e9cc77e86eedfc28fa37713b5471e906b7 h: refs/heads/master i: 352785: 3696b5de34c8ba1525ec7c5da6b5058a7ee6307a 352783: ea814349c9d0f0f8b3ca8804e6aec69e7df82b36 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7a0b1bfedc60..7d315576252a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb6b9a8cad65e820b145547844b108117cece3a0 +refs/heads/master: 07dcf8e9cc77e86eedfc28fa37713b5471e906b7 diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index 0fe68c46267e..29d82cf1528e 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -1689,10 +1689,13 @@ static void fec_reset_phy(struct platform_device *pdev) msec = 1; phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0); + if (!gpio_is_valid(phy_reset)) + return; + err = devm_gpio_request_one(&pdev->dev, phy_reset, GPIOF_OUT_INIT_LOW, "phy-reset"); if (err) { - pr_debug("FEC: failed to get gpio phy-reset: %d\n", err); + dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err); return; } msleep(msec);