shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm: bridge: adv7511: use dev_err_probe in probe function

Browse Source 
[ Upstream commit 2a86524839 ]

adv7511 probe may need to be attempted multiple times before no
-EPROBE_DEFER is returned. Currently, every such probe results in
an error message:

[    4.534229] adv7511 1-003d: failed to find dsi host
[    4.580288] adv7511 1-003d: failed to find dsi host

This is misleading, as there is no error and probe deferral is normal
behavior. Fix this by using dev_err_probe that will suppress
-EPROBE_DEFER errors. While at it, we touch all dev_err in the probe
path. This makes the code more concise and included the error code
everywhere to aid user in debugging.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026125246.3188260-1-a.fatoum@pengutronix.de
Stable-dep-of: 81adbd3ff21c ("drm: adv7511: Fix use-after-free in adv7533_attach_dsi()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ahmad Fatoum
2022-10-26 14:52:46 +02:00
committed by Greg Kroah-Hartman
parent 2d43119248
commit 90d4d2718e
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
View File

@@ -1224,10 +1224,8 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
return ret; return ret;
ret = adv7511_init_regulators(adv7511); ret = adv7511_init_regulators(adv7511);
if (ret) { if (ret)
dev_err(dev, "failed to init regulators\n"); return dev_err_probe(dev, ret, "failed to init regulators\n");
return ret;
}
/* /*
* The power down GPIO is optional. If present, toggle it from active to * The power down GPIO is optional. If present, toggle it from active to

20
drivers/gpu/drm/bridge/adv7511/adv7533.c
View File

@@ -146,16 +146,14 @@ int adv7533_attach_dsi(struct adv7511 *adv)
}; };
host = of_find_mipi_dsi_host_by_node(adv->host_node); host = of_find_mipi_dsi_host_by_node(adv->host_node);
if (!host) { if (!host)
dev_err(dev, "failed to find dsi host\n"); return dev_err_probe(dev, -EPROBE_DEFER,
return -EPROBE_DEFER; "failed to find dsi host\n");
}
dsi = devm_mipi_dsi_device_register_full(dev, host, &info); dsi = devm_mipi_dsi_device_register_full(dev, host, &info);
if (IS_ERR(dsi)) { if (IS_ERR(dsi))
dev_err(dev, "failed to create dsi device\n"); return dev_err_probe(dev, PTR_ERR(dsi),
return PTR_ERR(dsi); "failed to create dsi device\n");
}
adv->dsi = dsi; adv->dsi = dsi;
@@ -165,10 +163,8 @@ int adv7533_attach_dsi(struct adv7511 *adv)
MIPI_DSI_MODE_NO_EOT_PACKET | MIPI_DSI_MODE_VIDEO_HSE; MIPI_DSI_MODE_NO_EOT_PACKET | MIPI_DSI_MODE_VIDEO_HSE;
ret = devm_mipi_dsi_attach(dev, dsi); ret = devm_mipi_dsi_attach(dev, dsi);
if (ret < 0) { if (ret < 0)
dev_err(dev, "failed to attach dsi to host\n"); return dev_err_probe(dev, ret, "failed to attach dsi to host\n");
return ret;
}
return 0; return 0;
} }