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 | 529d527e2c0b7016a5b3707531f3ac17bbc65af5 (patch) | |
| tree | 851753d3bdb82ffee146359ec352d252fe0e1d09 /target/linux/generic/patches-3.18/031-bcma-from-4.5.patch | |
| parent | baa618790ad359e99396a233d85e9ef1e5c917ca (diff) | |
| download | upstream-529d527e2c0b7016a5b3707531f3ac17bbc65af5.tar.gz upstream-529d527e2c0b7016a5b3707531f3ac17bbc65af5.tar.bz2 upstream-529d527e2c0b7016a5b3707531f3ac17bbc65af5.zip | |
kernel: backport bcma stuff sent for 4.6
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 48449
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) + { |