diff options
| author | Arnd Bergmann | 2017-08-18 23:34:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2017-08-18 23:34:32 +0200 |
| commit | 03f89359929eee410cc9a73be094d717b33bb65c (patch) | |
| tree | 39aebb345698d6bef3ba7b0a8d6b46d9e1dcb8c0 /drivers/firmware | |
| parent | f2970be50a15013a910fb556e5b9c9131e8c1bee (diff) | |
| parent | 122954edfdf5888dbd532acf2b945af15660da66 (diff) | |
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
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/tegra/bpmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index b25179517cc5..73ca55b7b7ec 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -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: |