summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-05-11 09:40:14 +0200
committerHenrik Aberg <henrik.aberg@stericsson.com>2011-05-18 09:40:11 +0200
commitad62f66bd1fcc4542bbc421776a020be4723450a (patch)
treed90eb6e1743517c74ee9c1258aa8c160967710b3
parente1f3f32118eae27ae9d9d2208d2d02c120f60eab (diff)
CAIF: removed netdev_info netdev_warn
Some of the netdevice structure field are not initialized or unitialized when the macros are used. Result is a segfault on a NULL pointer. Change-Id: Ia0679705aa663252804bd1b7d5727b09288d3931 Signed-off-by: Erwan Bracq <erwan.bracq@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21526 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: net/caif/caif_dev.c
-rw-r--r--net/caif/caif_dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 75e00d59eb4..50beba2e256 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -198,20 +198,20 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
switch (what) {
case NETDEV_REGISTER:
- netdev_info(dev, "register\n");
caifd = caif_device_alloc(dev);
if (caifd == NULL)
break;
+ netdev_info(dev, "register\n");
caifdev = netdev_priv(dev);
caifdev->flowctrl = dev_flowctrl;
atomic_set(&caifd->state, what);
break;
case NETDEV_UP:
- netdev_info(dev, "up\n");
caifd = caif_get(dev);
if (caifd == NULL)
break;
+ netdev_info(dev, "up\n");
caifdev = netdev_priv(dev);
if (atomic_read(&caifd->state) == NETDEV_UP) {
netdev_info(dev, "already up\n");