On 31/01/2020 16:59, Thierry Reding wrote:
From: Thierry Reding <redacted>
Make sure the SOR module is suspenden after we fail to register the SOR
pad output clock.
s/suspenden/suspended/
quoted hunk
Signed-off-by: Thierry Reding <redacted>
---
drivers/gpu/drm/tegra/sor.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 41d24949478e..96cd89bb2e82 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -3922,15 +3922,16 @@ static int tegra_sor_probe(struct platform_device *pdev)
if (!sor->clk_pad) {
char *name;
- err = host1x_client_resume(&sor->client);
- if (err < 0) {
- dev_err(sor->dev, "failed to resume: %d\n", err);
+ name = devm_kasprintf(sor->dev, GFP_KERNEL, "sor%u_pad_clkout",
+ sor->index);
+ if (!name) {
+ err = -ENOMEM;
goto remove;
}
- name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "sor%u_pad_clkout", sor->index);
- if (!name) {
- err = -ENOMEM;
+ err = host1x_client_resume(&sor->client);
+ if (err < 0) {
+ dev_err(sor->dev, "failed to resume: %d\n", err);
goto remove;
}
Otherwise ...
Reviewed-by: Jon Hunter <redacted>
Tested-by: Jon Hunter <redacted>
Cheers
Jon
--
nvpublic