mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Add a directory by kernel instead of a common root, add qnap-301w and rpi4 kernel 6.1 suppport
This commit is contained in:
parent
e910436a7a
commit
46837ec4c0
9459 changed files with 362648 additions and 116345 deletions
|
|
@ -0,0 +1,61 @@
|
|||
From 5a94fec7f8b5e11e45b62ef94a7f236bc891c99e 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 672/726] 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(-)
|
||||
|
||||
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
|
||||
index 530da5b03e61..51f430ca3652 100644
|
||||
--- a/drivers/media/i2c/imx290.c
|
||||
+++ b/drivers/media/i2c/imx290.c
|
||||
@@ -1224,10 +1224,9 @@ static int imx290_probe(struct i2c_client *client)
|
||||
|
||||
/* 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_client *client)
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
--
|
||||
2.33.1
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue