Re: [PATCH 14/15] media: soc_camera: fill in bus_info field

2015-06-12 Thread Hans Verkuil
On 06/03/2015 04:00 PM, William Towle wrote:
> From: Rob Taylor 
> 
> Adapt soc_camera_querycap() so that cap->bus_info is populated in
> addition to cap->driver.
> 
> Signed-off-by: Rob Taylor 
> Reviewed-by: William Towle 
> ---
>  drivers/media/platform/soc_camera/soc_camera.c |1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/media/platform/soc_camera/soc_camera.c 
> b/drivers/media/platform/soc_camera/soc_camera.c
> index 4e59833..675cfc4 100644
> --- a/drivers/media/platform/soc_camera/soc_camera.c
> +++ b/drivers/media/platform/soc_camera/soc_camera.c
> @@ -954,6 +954,7 @@ static int soc_camera_querycap(struct file *file, void  
> *priv,
>   WARN_ON(priv != file->private_data);
>  
>   strlcpy(cap->driver, ici->drv_name, sizeof(cap->driver));
> + strlcpy(cap->bus_info, "platform:soc_camera", sizeof(cap->bus_info));

Sorry, but this is the wrong place. This should be done in rcar_vin_querycap.

If you have multiple soc_camera instances, then the bus_info should be unique
for each. And that's obviously not the case if it's done here.

The rcar driver will know, however.

Regards,

Hans

>   return ici->ops->querycap(ici, cap);
>  }
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 14/15] media: soc_camera: fill in bus_info field

2015-06-03 Thread William Towle
From: Rob Taylor 

Adapt soc_camera_querycap() so that cap->bus_info is populated in
addition to cap->driver.

Signed-off-by: Rob Taylor 
Reviewed-by: William Towle 
---
 drivers/media/platform/soc_camera/soc_camera.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/soc_camera/soc_camera.c 
b/drivers/media/platform/soc_camera/soc_camera.c
index 4e59833..675cfc4 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -954,6 +954,7 @@ static int soc_camera_querycap(struct file *file, void  
*priv,
WARN_ON(priv != file->private_data);
 
strlcpy(cap->driver, ici->drv_name, sizeof(cap->driver));
+   strlcpy(cap->bus_info, "platform:soc_camera", sizeof(cap->bus_info));
return ici->ops->querycap(ici, cap);
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html