From ab62eb699940123c28864fb1097bbc85dd1df246 Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda Date: Wed, 15 Feb 2012 17:54:56 +0000 Subject: [PATCH] --- yaml --- r: 290183 b: refs/heads/master c: 150647fb2c313d7c5184fca3fa0829a4a7d6f7bc h: refs/heads/master i: 290181: bbf111e611bf8d6ef74a6f4a0e04cef5c9ae68e0 290179: 6b68ece82f6bb52e604ee8974f1ae7fc41397c7a 290175: d2438fc918603b197a8bdc38469578eb0c9e0ba5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/renesas/sh_eth.c | 4 ++-- trunk/include/linux/sh_eth.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a038f949c997..0724c09e4e8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3acbc9715a5ac8a2534a69eb3488b63b7c9fb1e2 +refs/heads/master: 150647fb2c313d7c5184fca3fa0829a4a7d6f7bc diff --git a/trunk/drivers/net/ethernet/renesas/sh_eth.c b/trunk/drivers/net/ethernet/renesas/sh_eth.c index 8f53b5ac7f05..5a5afbc7273b 100644 --- a/trunk/drivers/net/ethernet/renesas/sh_eth.c +++ b/trunk/drivers/net/ethernet/renesas/sh_eth.c @@ -1859,8 +1859,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev) /* read and set MAC address */ read_mac_address(ndev, pd->mac_addr); - /* First device only init */ - if (!devno) { + /* initialize first or needed device */ + if (!devno || pd->needs_init) { if (mdp->cd->tsu) { struct resource *rtsu; rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1); diff --git a/trunk/include/linux/sh_eth.h b/trunk/include/linux/sh_eth.h index 2076acf8294d..b17d765ded84 100644 --- a/trunk/include/linux/sh_eth.h +++ b/trunk/include/linux/sh_eth.h @@ -20,6 +20,7 @@ struct sh_eth_plat_data { unsigned char mac_addr[6]; unsigned no_ether_link:1; unsigned ether_link_active_low:1; + unsigned needs_init:1; }; #endif