Merge tag 'drm-intel-next-2013-07-12' of git://people.freedesktop.org/~danvet/drm...

[mirror_ubuntu-artful-kernel.git] / net / caif / caif_dev.c

diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 1f9ece1a9c344655708c7d0e015ed0a46dd56a03..4dca159435cfe17dcc09fadccfebee7ca49b1075 100644 (file)
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -352,9 +352,9 @@ EXPORT_SYMBOL(caif_enroll_dev);
 
 /* notify Caif of device events */
 static int caif_device_notify(struct notifier_block *me, unsigned long what,
-                             void *arg)
+                             void *ptr)
 {
-       struct net_device *dev = arg;
+       struct net_device *dev = netdev_notifier_info_to_dev(ptr);
        struct caif_device_entry *caifd = NULL;
        struct caif_dev_common *caifdev;
        struct cfcnfg *cfg;