kernel: bump 5.10 to 5.10.65

[openwrt/staging/jow.git] / target / linux / generic / pending-5.10 / 800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch

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 cb02c7182963e75c5d15ff8c79ba121488934554..511a9f7555139437b1e0db8dbcdd00e9cbef2a5e 100644 (file)
--- 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) {