tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'mips-fixes_5.19_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Thomas Bogendoerfer:

- several refcount fixes

- added missing clock for ingenic

- fix wrong irq_err_count for vr41xx

* tag 'mips-fixes_5.19_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
mips: lantiq: Add missing of_node_put() in irq.c
mips: dts: ingenic: Add TCU clock to x1000/x1830 tcu device node
mips/pic32/pic32mzda: Fix refcount leak bugs
mips: lantiq: xway: Fix refcount leak bug in sysctrl
mips: lantiq: falcon: Fix refcount leak bug in sysctrl
mips: ralink: Fix refcount leak in of.c
mips: mti-malta: Fix refcount leak in malta-time.c
arch: mips: generic: Add missing of_node_put() in board-ranchu.c
MIPS: Remove repetitive increase irq_err_count

Linus Torvalds 599d1691 399bd66e

+31 -9
+3 -2
arch/mips/boot/dts/ingenic/x1000.dtsi
··· 111 111 112 112 clocks = <&cgu X1000_CLK_RTCLK>, 113 113 <&cgu X1000_CLK_EXCLK>, 114 - <&cgu X1000_CLK_PCLK>; 115 - clock-names = "rtc", "ext", "pclk"; 114 + <&cgu X1000_CLK_PCLK>, 115 + <&cgu X1000_CLK_TCU>; 116 + clock-names = "rtc", "ext", "pclk", "tcu"; 116 117 117 118 interrupt-controller; 118 119 #interrupt-cells = <1>;
+3 -2
arch/mips/boot/dts/ingenic/x1830.dtsi
··· 104 104 105 105 clocks = <&cgu X1830_CLK_RTCLK>, 106 106 <&cgu X1830_CLK_EXCLK>, 107 - <&cgu X1830_CLK_PCLK>; 108 - clock-names = "rtc", "ext", "pclk"; 107 + <&cgu X1830_CLK_PCLK>, 108 + <&cgu X1830_CLK_TCU>; 109 + clock-names = "rtc", "ext", "pclk", "tcu"; 109 110 110 111 interrupt-controller; 111 112 #interrupt-cells = <1>;
+1
arch/mips/generic/board-ranchu.c
··· 44 44 __func__); 45 45 46 46 rtc_base = of_iomap(np, 0); 47 + of_node_put(np); 47 48 if (!rtc_base) 48 49 panic("%s(): Failed to ioremap Goldfish RTC base!", __func__); 49 50
+6
arch/mips/lantiq/falcon/sysctrl.c
··· 208 208 of_address_to_resource(np_sysgpe, 0, &res_sys[2])) 209 209 panic("Failed to get core resources"); 210 210 211 + of_node_put(np_status); 212 + of_node_put(np_ebu); 213 + of_node_put(np_sys1); 214 + of_node_put(np_syseth); 215 + of_node_put(np_sysgpe); 216 + 211 217 if ((request_mem_region(res_status.start, resource_size(&res_status), 212 218 res_status.name) < 0) || 213 219 (request_mem_region(res_ebu.start, resource_size(&res_ebu),
+1
arch/mips/lantiq/irq.c
··· 408 408 if (!ltq_eiu_membase) 409 409 panic("Failed to remap eiu memory"); 410 410 } 411 + of_node_put(eiu_node); 411 412 412 413 return 0; 413 414 }
+4
arch/mips/lantiq/xway/sysctrl.c
··· 441 441 of_address_to_resource(np_ebu, 0, &res_ebu)) 442 442 panic("Failed to get core resources"); 443 443 444 + of_node_put(np_pmu); 445 + of_node_put(np_cgu); 446 + of_node_put(np_ebu); 447 + 444 448 if (!request_mem_region(res_pmu.start, resource_size(&res_pmu), 445 449 res_pmu.name) || 446 450 !request_mem_region(res_cgu.start, resource_size(&res_cgu),
+2
arch/mips/mti-malta/malta-time.c
··· 214 214 215 215 if (of_update_property(node, &gic_frequency_prop) < 0) 216 216 pr_err("error updating gic frequency property\n"); 217 + 218 + of_node_put(node); 217 219 } 218 220 219 221 #endif
+6 -1
arch/mips/pic32/pic32mzda/init.c
··· 98 98 np = of_find_compatible_node(NULL, NULL, lookup->compatible); 99 99 if (np) { 100 100 lookup->name = (char *)np->name; 101 - if (lookup->phys_addr) 101 + if (lookup->phys_addr) { 102 + of_node_put(np); 102 103 continue; 104 + } 103 105 if (!of_address_to_resource(np, 0, &res)) 104 106 lookup->phys_addr = res.start; 107 + of_node_put(np); 105 108 } 106 109 } 110 + 111 + of_node_put(root); 107 112 108 113 return 0; 109 114 }
+3
arch/mips/pic32/pic32mzda/time.c
··· 32 32 goto default_map; 33 33 34 34 irq = irq_of_parse_and_map(node, 0); 35 + 36 + of_node_put(node); 37 + 35 38 if (!irq) 36 39 goto default_map; 37 40
+2
arch/mips/ralink/of.c
··· 40 40 if (of_address_to_resource(np, 0, &res)) 41 41 panic("Failed to get resource for %s", node); 42 42 43 + of_node_put(np); 44 + 43 45 if (!request_mem_region(res.start, 44 46 resource_size(&res), 45 47 res.name))
-2
arch/mips/vr41xx/common/icu.c
··· 640 640 641 641 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2); 642 642 643 - atomic_inc(&irq_err_count); 644 - 645 643 return -1; 646 644 } 647 645
-2
drivers/gpio/gpio-vr41xx.c
··· 217 217 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", 218 218 maskl, pendl, maskh, pendh); 219 219 220 - atomic_inc(&irq_err_count); 221 - 222 220 return -EINVAL; 223 221 } 224 222