mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			72 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			72 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 101499e3fd077ad3e30e1f19c87169ac33aa5c41 Mon Sep 17 00:00:00 2001
 | |
| From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 | |
| Date: Thu, 16 Feb 2023 00:30:03 +0200
 | |
| Subject: [PATCH] media: i2c: imx290: Add the error code to logs in
 | |
|  start_streaming
 | |
| 
 | |
| Should be upstream commit 5fcaecd6b5aa
 | |
| 
 | |
| imx290_start_streaming logs what failed, but not the error
 | |
| code from that function. Add it into the log message.
 | |
| 
 | |
| Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 | |
| Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
 | |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 | |
| Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 | |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
 | |
| ---
 | |
|  drivers/media/i2c/imx290.c | 12 ++++++------
 | |
|  1 file changed, 6 insertions(+), 6 deletions(-)
 | |
| 
 | |
| --- a/drivers/media/i2c/imx290.c
 | |
| +++ b/drivers/media/i2c/imx290.c
 | |
| @@ -1012,20 +1012,20 @@ static int imx290_start_streaming(struct
 | |
|  	/* Set clock parameters based on mode and xclk */
 | |
|  	ret = imx290_set_clock(imx290);
 | |
|  	if (ret < 0) {
 | |
| -		dev_err(imx290->dev, "Could not set clocks\n");
 | |
| +		dev_err(imx290->dev, "Could not set clocks - %d\n", ret);
 | |
|  		return ret;
 | |
|  	}
 | |
|  
 | |
|  	/* Set data lane count */
 | |
|  	ret = imx290_set_data_lanes(imx290);
 | |
|  	if (ret < 0) {
 | |
| -		dev_err(imx290->dev, "Could not set data lanes\n");
 | |
| +		dev_err(imx290->dev, "Could not set data lanes - %d\n", ret);
 | |
|  		return ret;
 | |
|  	}
 | |
|  
 | |
|  	ret = imx290_set_csi_config(imx290);
 | |
|  	if (ret < 0) {
 | |
| -		dev_err(imx290->dev, "Could not set csi cfg\n");
 | |
| +		dev_err(imx290->dev, "Could not set csi cfg - %d\n", ret);
 | |
|  		return ret;
 | |
|  	}
 | |
|  
 | |
| @@ -1033,7 +1033,7 @@ static int imx290_start_streaming(struct
 | |
|  	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
 | |
|  	ret = imx290_setup_format(imx290, format);
 | |
|  	if (ret < 0) {
 | |
| -		dev_err(imx290->dev, "Could not set frame format\n");
 | |
| +		dev_err(imx290->dev, "Could not set frame format - %d\n", ret);
 | |
|  		return ret;
 | |
|  	}
 | |
|  
 | |
| @@ -1041,14 +1041,14 @@ static int imx290_start_streaming(struct
 | |
|  	ret = imx290_set_register_array(imx290, imx290->current_mode->data,
 | |
|  					imx290->current_mode->data_size);
 | |
|  	if (ret < 0) {
 | |
| -		dev_err(imx290->dev, "Could not set current mode\n");
 | |
| +		dev_err(imx290->dev, "Could not set current mode - %d\n", ret);
 | |
|  		return ret;
 | |
|  	}
 | |
|  
 | |
|  	/* Apply customized values from user */
 | |
|  	ret = __v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
 | |
|  	if (ret) {
 | |
| -		dev_err(imx290->dev, "Could not sync v4l2 controls\n");
 | |
| +		dev_err(imx290->dev, "Could not sync v4l2 controls - %d\n", ret);
 | |
|  		return ret;
 | |
|  	}
 | |
|  
 |