diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2016-01-22 09:22:37 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2016-01-22 09:22:37 +0000 |
commit | f38b6bf1574bc7bbbc4512795bc81623eb542862 (patch) | |
tree | 294ba6ef5dd9ee6920c57af2ced299da338a2679 /target/linux/generic/patches-3.18/031-bcma-from-4.5.patch | |
parent | bcb4d0a14af18b05651218cf13daf766e70cf727 (diff) | |
download | master-187ad058-f38b6bf1574bc7bbbc4512795bc81623eb542862.tar.gz master-187ad058-f38b6bf1574bc7bbbc4512795bc81623eb542862.tar.bz2 master-187ad058-f38b6bf1574bc7bbbc4512795bc81623eb542862.zip |
kernel: backport bcma stuff sent for 4.6
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48449 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/031-bcma-from-4.5.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/031-bcma-from-4.5.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/031-bcma-from-4.5.patch b/target/linux/generic/patches-3.18/031-bcma-from-4.5.patch new file mode 100644 index 0000000000..171395dcec --- /dev/null +++ b/target/linux/generic/patches-3.18/031-bcma-from-4.5.patch @@ -0,0 +1,49 @@ +--- a/drivers/bcma/main.c ++++ b/drivers/bcma/main.c +@@ -637,11 +637,36 @@ static int bcma_device_uevent(struct dev + core->id.rev, core->id.class); + } + +-static int __init bcma_modinit(void) ++static unsigned int bcma_bus_registered; ++ ++/* ++ * If built-in, bus has to be registered early, before any driver calls ++ * bcma_driver_register. ++ * Otherwise registering driver would trigger BUG in driver_register. ++ */ ++static int __init bcma_init_bus_register(void) + { + int err; + ++ if (bcma_bus_registered) ++ return 0; ++ + err = bus_register(&bcma_bus_type); ++ if (!err) ++ bcma_bus_registered = 1; ++ ++ return err; ++} ++#ifndef MODULE ++fs_initcall(bcma_init_bus_register); ++#endif ++ ++/* Main initialization has to be done with SPI/mtd/NAND/SPROM available */ ++static int __init bcma_modinit(void) ++{ ++ int err; ++ ++ err = bcma_init_bus_register(); + if (err) + return err; + +@@ -660,7 +685,7 @@ static int __init bcma_modinit(void) + + return err; + } +-fs_initcall(bcma_modinit); ++module_init(bcma_modinit); + + static void __exit bcma_modexit(void) + { |