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 'char-misc-5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
"Here are two small driver fixes for 5.18-rc7 that resolve reported
problems:

- slimbus driver irq bugfix

- interconnect sync state bugfix

Both of these have been in linux-next with no reported problems"

* tag 'char-misc-5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
slimbus: qcom: Fix IRQ check in qcom_slim_probe
interconnect: Restore sync state by ignoring ipa-virt in provider count

+9 -3
+7 -1
drivers/interconnect/core.c
··· 1087 1087 { 1088 1088 struct device_node *child; 1089 1089 int count = 0; 1090 + const struct of_device_id __maybe_unused ignore_list[] = { 1091 + { .compatible = "qcom,sc7180-ipa-virt" }, 1092 + { .compatible = "qcom,sdx55-ipa-virt" }, 1093 + {} 1094 + }; 1090 1095 1091 1096 for_each_available_child_of_node(np, child) { 1092 - if (of_property_read_bool(child, "#interconnect-cells")) 1097 + if (of_property_read_bool(child, "#interconnect-cells") && 1098 + likely(!of_match_node(ignore_list, child))) 1093 1099 count++; 1094 1100 count += of_count_icc_providers(child); 1095 1101 }
+2 -2
drivers/slimbus/qcom-ctrl.c
··· 510 510 } 511 511 512 512 ctrl->irq = platform_get_irq(pdev, 0); 513 - if (!ctrl->irq) { 513 + if (ctrl->irq < 0) { 514 514 dev_err(&pdev->dev, "no slimbus IRQ\n"); 515 - return -ENODEV; 515 + return ctrl->irq; 516 516 } 517 517 518 518 sctrl = &ctrl->ctrl;