Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (3a83f575) · Commits · 戴 / test

drivers/irqchip/irq-gic-v3-its.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ static struct its_collection dev_event_to_col(struct its_device its_dev,

		static struct its_collection valid_col(struct its_collection col)
		{
		if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(0, 15)))
		if (WARN_ON_ONCE(col->target_address & GENMASK_ULL(15, 0)))
		return NULL;

		return col;

+8 −7

Original line number	Diff line number	Diff line
		@@ -208,20 +208,19 @@ static int rza1_irqc_probe(struct platform_device *pdev)
		return PTR_ERR(priv->base);

		gic_node = of_irq_find_parent(np);
		if (gic_node) {
		if (gic_node)
		parent = irq_find_host(gic_node);
		of_node_put(gic_node);
		}

		if (!parent) {
		dev_err(dev, "cannot find parent domain\n");
		return -ENODEV;
		ret = -ENODEV;
		goto out_put_node;
		}

		ret = rza1_irqc_parse_map(priv, gic_node);
		if (ret) {
		dev_err(dev, "cannot parse %s: %d\n", "interrupt-map", ret);
		return ret;
		goto out_put_node;
		}

		priv->chip.name = "rza1-irqc",
		@@ -237,10 +236,12 @@ static int rza1_irqc_probe(struct platform_device *pdev)
		priv);
		if (!priv->irq_domain) {
		dev_err(dev, "cannot initialize irq domain\n");
		return -ENOMEM;
		ret = -ENOMEM;
		}

		return 0;
		out_put_node:
		of_node_put(gic_node);
		return ret;
		}

		static int rza1_irqc_remove(struct platform_device *pdev)