Skip to content

Commit a60294d

Browse files
Andrzej Hajdagregkh
authored andcommitted
drm/bridge/sii8620: fix resource acquisition error handling
In case of error during resource acquisition driver should print error message only in case it is not deferred probe, using dev_err_probe helper solves the issue. Moreover it records defer probe reason for debugging. Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d090b70 commit a60294d

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

drivers/gpu/drm/bridge/sil-sii8620.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,10 +2299,9 @@ static int sii8620_probe(struct i2c_client *client,
22992299
INIT_LIST_HEAD(&ctx->mt_queue);
23002300

23012301
ctx->clk_xtal = devm_clk_get(dev, "xtal");
2302-
if (IS_ERR(ctx->clk_xtal)) {
2303-
dev_err(dev, "failed to get xtal clock from DT\n");
2304-
return PTR_ERR(ctx->clk_xtal);
2305-
}
2302+
if (IS_ERR(ctx->clk_xtal))
2303+
return dev_err_probe(dev, PTR_ERR(ctx->clk_xtal),
2304+
"failed to get xtal clock from DT\n");
23062305

23072306
if (!client->irq) {
23082307
dev_err(dev, "no irq provided\n");
@@ -2313,16 +2312,14 @@ static int sii8620_probe(struct i2c_client *client,
23132312
sii8620_irq_thread,
23142313
IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
23152314
"sii8620", ctx);
2316-
if (ret < 0) {
2317-
dev_err(dev, "failed to install IRQ handler\n");
2318-
return ret;
2319-
}
2315+
if (ret < 0)
2316+
return dev_err_probe(dev, ret,
2317+
"failed to install IRQ handler\n");
23202318

23212319
ctx->gpio_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
2322-
if (IS_ERR(ctx->gpio_reset)) {
2323-
dev_err(dev, "failed to get reset gpio from DT\n");
2324-
return PTR_ERR(ctx->gpio_reset);
2325-
}
2320+
if (IS_ERR(ctx->gpio_reset))
2321+
return dev_err_probe(dev, PTR_ERR(ctx->gpio_reset),
2322+
"failed to get reset gpio from DT\n");
23262323

23272324
ctx->supplies[0].supply = "cvcc10";
23282325
ctx->supplies[1].supply = "iovcc18";

0 commit comments

Comments
 (0)