From b9e4f155d926ad2f591b33f7b8b842bcfba5a077 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 12 Dec 2008 21:32:10 -0800 Subject: [PATCH] --- yaml --- r: 122605 b: refs/heads/master c: 65f667fb472d28c1594d862b213a564e292a466c h: refs/heads/master i: 122603: fd03bbd5e68e7c431d11cf169f443b4d32792335 v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/ethtool.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5b5a54df1b77..9f668adbfbea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b2734dcbfd2dc6b6e4b00bc6971504d7657a4eb +refs/heads/master: 65f667fb472d28c1594d862b213a564e292a466c diff --git a/trunk/drivers/net/sfc/ethtool.c b/trunk/drivers/net/sfc/ethtool.c index cd92c4d8dbc5..9c533e036a00 100644 --- a/trunk/drivers/net/sfc/ethtool.c +++ b/trunk/drivers/net/sfc/ethtool.c @@ -182,12 +182,16 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = { */ /* Identify device by flashing LEDs */ -static int efx_ethtool_phys_id(struct net_device *net_dev, u32 seconds) +static int efx_ethtool_phys_id(struct net_device *net_dev, u32 count) { struct efx_nic *efx = netdev_priv(net_dev); efx->board_info.blink(efx, 1); - schedule_timeout_interruptible(seconds * HZ); + set_current_state(TASK_INTERRUPTIBLE); + if (count) + schedule_timeout(count * HZ); + else + schedule(); efx->board_info.blink(efx, 0); return 0; }