From 26c0d4a5f3dc79b2a5ae83307751ebabd414eac0 Mon Sep 17 00:00:00 2001 From: Casey Leedom Date: Thu, 11 Nov 2010 09:06:52 +0000 Subject: [PATCH] --- yaml --- r: 222047 b: refs/heads/master c: e7a3795f56122cc92530c3f9412b8ff19b70184c h: refs/heads/master i: 222045: f7563a79ec972623b786a167caf4894a491b15da 222043: c757789d8d16f05115bdd371abf234d85e1b9d60 222039: fd8abc94065a848a95c60f6e0a1b9859ea4b426f 222031: dfe17d65e72ad2ac6a67a15aa572cba38333a5e8 222015: a10c9798dfa8a3fbac05b90f80551205405e6414 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb4vf/cxgb4vf_main.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2044b9c2b302..a51599e21295 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b6edf878a28979df6057cf414c51ab39bc3cc6f +refs/heads/master: e7a3795f56122cc92530c3f9412b8ff19b70184c diff --git a/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c b/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c index 4487b1ace660..8da3bda13f33 100644 --- a/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c +++ b/trunk/drivers/net/cxgb4vf/cxgb4vf_main.c @@ -753,7 +753,9 @@ static int cxgb4vf_open(struct net_device *dev) if (err) return err; set_bit(pi->port_id, &adapter->open_device_map); - link_start(dev); + err = link_start(dev); + if (err) + return err; netif_tx_start_all_queues(dev); return 0; }