diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-09-15 10:31:37 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-09-30 22:29:33 +0100 |
| commit | 3a2c16d1d23a4a178089db73748e4f7c0c384887 (patch) | |
| tree | 3e225e519131679a818a26f7b1cd1a6d3c74a7d9 /target/linux/generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch | |
| parent | fa13dd658f59df41b9184d4dc15a5b29530e7c2c (diff) | |
| download | upstream-3a2c16d1d23a4a178089db73748e4f7c0c384887.tar.gz upstream-3a2c16d1d23a4a178089db73748e4f7c0c384887.tar.bz2 upstream-3a2c16d1d23a4a178089db73748e4f7c0c384887.zip | |
kernel: bump 5.10 to 5.10.65
Manually refreshed:
generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
bcm27xx/patches-5.10/950-0053-firmware-bcm2835-Support-ARCH_BCM270x.patch
bcm27xx/patches-5.10/950-0087-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch')
| -rw-r--r-- | target/linux/generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/target/linux/generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch b/target/linux/generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch index cb02c71829..511a9f7555 100644 --- a/target/linux/generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch +++ b/target/linux/generic/pending-5.10/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch @@ -50,20 +50,14 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> if (err) --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -236,12 +236,16 @@ EXPORT_SYMBOL(bcma_core_irq); - - void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) - { -+ struct device *dev = &core->dev; -+ - core->dev.release = bcma_release_core_dev; +@@ -241,8 +241,10 @@ void bcma_prepare_core(struct bcma_bus * core->dev.bus = &bcma_bus_type; dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index); core->dev.parent = bus->dev; - if (bus->dev) + if (bus->dev) { bcma_of_fill_device(bus->dev, core); -+ dma_coerce_mask_and_coherent(dev, bus->dev->coherent_dma_mask); ++ dma_coerce_mask_and_coherent(&core->dev, bus->dev->coherent_dma_mask); + } switch (bus->hosttype) { |