From ec7ebb3b91018b8a3e3f9e8454e234ef68890994 Mon Sep 17 00:00:00 2001 From: Mike Sinkovsky Date: Tue, 10 Apr 2012 19:53:53 +0000 Subject: [PATCH] --- yaml --- r: 300730 b: refs/heads/master c: 77577bf93275b485cecb4f358a085949c32e9dcd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/wiznet/w5100.c | 2 +- trunk/drivers/net/ethernet/wiznet/w5300.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e39aa823785a..7cfdc8c873dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b17876f3e674a794a2d83aa47a9b356d36b7418 +refs/heads/master: 77577bf93275b485cecb4f358a085949c32e9dcd diff --git a/trunk/drivers/net/ethernet/wiznet/w5100.c b/trunk/drivers/net/ethernet/wiznet/w5100.c index 18c80982fc6c..a75e9ef5a4ce 100644 --- a/trunk/drivers/net/ethernet/wiznet/w5100.c +++ b/trunk/drivers/net/ethernet/wiznet/w5100.c @@ -682,7 +682,7 @@ static int __devinit w5100_hw_probe(struct platform_device *pdev) return ret; priv->irq = irq; - priv->link_gpio = data->link_gpio; + priv->link_gpio = data ? data->link_gpio : -EINVAL; if (gpio_is_valid(priv->link_gpio)) { char *link_name = devm_kzalloc(&pdev->dev, 16, GFP_KERNEL); if (!link_name) diff --git a/trunk/drivers/net/ethernet/wiznet/w5300.c b/trunk/drivers/net/ethernet/wiznet/w5300.c index f36addf9d2f6..3306a20ec211 100644 --- a/trunk/drivers/net/ethernet/wiznet/w5300.c +++ b/trunk/drivers/net/ethernet/wiznet/w5300.c @@ -594,7 +594,7 @@ static int __devinit w5300_hw_probe(struct platform_device *pdev) return ret; priv->irq = irq; - priv->link_gpio = data->link_gpio; + priv->link_gpio = data ? data->link_gpio : -EINVAL; if (gpio_is_valid(priv->link_gpio)) { char *link_name = devm_kzalloc(&pdev->dev, 16, GFP_KERNEL); if (!link_name)