Commit 5becde60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6811a466 d83ea024

drivers/interconnect/core.c

+7 −1
Original line number Diff line number Diff line
@@ -1087,9 +1087,15 @@ static int of_count_icc_providers(struct device_node *np) 
{

	struct device_node *child;

	int count = 0;

	const struct of_device_id __maybe_unused ignore_list[] = {

		{ .compatible = "qcom,sc7180-ipa-virt" },

		{ .compatible = "qcom,sdx55-ipa-virt" },

		{}

	};



	for_each_available_child_of_node(np, child) {

		if (of_property_read_bool(child, "#interconnect-cells"))

		if (of_property_read_bool(child, "#interconnect-cells") &&

		    likely(!of_match_node(ignore_list, child)))

			count++;

		count += of_count_icc_providers(child);

	}

drivers/slimbus/qcom-ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -510,9 +510,9 @@ static int qcom_slim_probe(struct platform_device *pdev) 
	}



	ctrl->irq = platform_get_irq(pdev, 0);

	if (!ctrl->irq) {

	if (ctrl->irq < 0) {

		dev_err(&pdev->dev, "no slimbus IRQ\n");

		return -ENODEV;

		return ctrl->irq;

	}



	sctrl = &ctrl->ctrl;