mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
793f8ab62c
Add kernel patches for version 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From 5589814e868f5becefdb44d28c07cb39cbb7e9bd Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Mon, 16 Jan 2023 15:44:46 +0100
|
|
Subject: [PATCH] media: i2c: imx290: Use dev_err_probe()
|
|
|
|
Upstream commit 63127235bebd
|
|
|
|
Improve error handling in the probe() function with dev_err_probe().
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
|
|
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
|
---
|
|
drivers/media/i2c/imx290.c | 20 ++++++++------------
|
|
1 file changed, 8 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/media/i2c/imx290.c
|
|
+++ b/drivers/media/i2c/imx290.c
|
|
@@ -1224,10 +1224,9 @@ static int imx290_probe(struct i2c_clien
|
|
|
|
/* get system clock (xclk) */
|
|
imx290->xclk = devm_clk_get(dev, "xclk");
|
|
- if (IS_ERR(imx290->xclk)) {
|
|
- dev_err(dev, "Could not get xclk");
|
|
- return PTR_ERR(imx290->xclk);
|
|
- }
|
|
+ if (IS_ERR(imx290->xclk))
|
|
+ return dev_err_probe(dev, PTR_ERR(imx290->xclk),
|
|
+ "Could not get xclk");
|
|
|
|
ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
|
|
&xclk_freq);
|
|
@@ -1250,17 +1249,14 @@ static int imx290_probe(struct i2c_clien
|
|
}
|
|
|
|
ret = imx290_get_regulators(dev, imx290);
|
|
- if (ret < 0) {
|
|
- dev_err(dev, "Cannot get regulators\n");
|
|
- return ret;
|
|
- }
|
|
+ if (ret < 0)
|
|
+ return dev_err_probe(dev, ret, "Cannot get regulators\n");
|
|
|
|
imx290->rst_gpio = devm_gpiod_get_optional(dev, "reset",
|
|
GPIOD_OUT_HIGH);
|
|
- if (IS_ERR(imx290->rst_gpio)) {
|
|
- dev_err(dev, "Cannot get reset gpio\n");
|
|
- return PTR_ERR(imx290->rst_gpio);
|
|
- }
|
|
+ if (IS_ERR(imx290->rst_gpio))
|
|
+ return dev_err_probe(dev, PTR_ERR(imx290->rst_gpio),
|
|
+ "Cannot get reset gpio\n");
|
|
|
|
mutex_init(&imx290->lock);
|
|
|