Commit 03f89359 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.14-firmware' of...

Merge tag 'tegra-for-4.14-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

Pull "firmare: Changes for v4.14-rc1" from Thierry Reding:

This contains a single bug fix that can lead to a crash in some rare
situations. Since this has never been reported to happen with the level
of support that exists upstream, this isn't considered critical.

* tag 'tegra-for-4.14-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  firmware: tegra: set drvdata earlier
parents f2970be5 122954ed
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -806,6 +806,8 @@ static int tegra_bpmp_probe(struct platform_device *pdev)

	dev_info(&pdev->dev, "firmware: %s\n", tag);

	platform_set_drvdata(pdev, bpmp);

	err = of_platform_default_populate(pdev->dev.of_node, NULL, &pdev->dev);
	if (err < 0)
		goto free_mrq;
@@ -822,8 +824,6 @@ static int tegra_bpmp_probe(struct platform_device *pdev)
	if (err < 0)
		goto free_mrq;

	platform_set_drvdata(pdev, bpmp);

	return 0;

free_mrq: