Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / net / bridge / br.c

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 401eeb9..1b169f8 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -43,7 +43,10 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
 
                if (event == NETDEV_REGISTER) {
                        /* register of bridge completed, add sysfs entries */
-                       br_sysfs_addbr(dev);
+                       err = br_sysfs_addbr(dev);
+                       if (err)
+                               return notifier_from_errno(err);
+
                        return NOTIFY_DONE;
                }
        }