From 996ed8859c852eeb64a556209e22a6d69d4573bc Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 24 Oct 2011 21:25:21 +0000 Subject: [PATCH] --- yaml --- r: 268898 b: refs/heads/master c: 08613e4626c06ca408fc55071f6aedee36986a87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/caif/caif_dev.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aadfbc1340c9..c2ac117b1510 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59fdaca9a4497ada47328d7b4b406b98a6f1c1a6 +refs/heads/master: 08613e4626c06ca408fc55071f6aedee36986a87 diff --git a/trunk/net/caif/caif_dev.c b/trunk/net/caif/caif_dev.c index 7f9ac0742d19..47fc8f3a47cf 100644 --- a/trunk/net/caif/caif_dev.c +++ b/trunk/net/caif/caif_dev.c @@ -212,8 +212,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, enum cfcnfg_phy_preference pref; enum cfcnfg_phy_type phy_type; struct cfcnfg *cfg; - struct caif_device_entry_list *caifdevs = - caif_device_list(dev_net(dev)); + struct caif_device_entry_list *caifdevs; if (dev->type != ARPHRD_CAIF) return 0; @@ -222,6 +221,8 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, if (cfg == NULL) return 0; + caifdevs = caif_device_list(dev_net(dev)); + switch (what) { case NETDEV_REGISTER: caifd = caif_device_alloc(dev);