Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 571a44e6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: phy: qusb: Don't try to ioremap NULL resource"

parents f31cc665 477612ab

drivers/usb/phy/phy-msm-qusb.c

+13 −8
Original line number Diff line number Diff line
@@ -786,19 +786,24 @@ static int qusb_phy_probe(struct platform_device *pdev) 


	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

							"qscratch_base");

	if (res) {

		qphy->qscratch_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(qphy->qscratch_base))

		if (IS_ERR(qphy->qscratch_base)) {

			dev_dbg(dev, "couldn't ioremap qscratch_base\n");

			qphy->qscratch_base = NULL;

		}

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

							"emu_phy_base");

	if (res) {

		qphy->emu_phy_base = devm_ioremap_resource(dev, res);

		if (IS_ERR(qphy->emu_phy_base)) {

			dev_dbg(dev, "couldn't ioremap emu_phy_base\n");

			qphy->emu_phy_base = NULL;

		dev_dbg(dev, "couldn't find emu_phy_base\n");

		}

	}



	qphy->tune2_efuse_reg = NULL;

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

							"tune2_efuse_addr");

	if (res) {