| Message ID | 1438685469-12230-1-git-send-email-josh.wu@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Josh, Sorry, I missed the 4.3 merge cycle, but isn't this patch a fix? Isn't it fixing soc-camera / atmel-isi on a specific platform, where the clock name is longer, than currently supported? Is this platform in the mainline and its current camera support is broken because of this? In such a case we could still push it in for 4.3 Thanks Guennadi On Tue, 4 Aug 2015, Josh Wu wrote: > Since in soc_of_bind() it may use the of node's full name as the clk_name, > and this full name may be longer than 32 characters, take at91 i2c sensor > as an example, length is 34 bytes: > /ahb/apb/i2c@f8028000/camera@0x30 > > So this patch increase the clk_name[] array size to 64. It seems big > enough so far. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > --- > > drivers/media/platform/soc_camera/soc_camera.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c > index d708df4..fcf3e97 100644 > --- a/drivers/media/platform/soc_camera/soc_camera.c > +++ b/drivers/media/platform/soc_camera/soc_camera.c > @@ -1621,7 +1621,7 @@ static int soc_of_bind(struct soc_camera_host *ici, > struct soc_camera_async_client *sasc; > struct soc_of_info *info; > struct i2c_client *client; > - char clk_name[V4L2_SUBDEV_NAME_SIZE]; > + char clk_name[V4L2_SUBDEV_NAME_SIZE + 32]; > int ret; > > /* allocate a new subdev and add match info to it */ > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Guennadi On 8/30/2015 10:06 PM, Guennadi Liakhovetski wrote: > Hi Josh, > > Sorry, I missed the 4.3 merge cycle, but isn't this patch a fix? Isn't it > fixing soc-camera / atmel-isi on a specific platform, where the clock name > is longer, than currently supported? Is this platform in the mainline and > its current camera support is broken because of this? I missed your email, so sorry for the late reply. yes, it will break the detect flow if the i2c camera is loaded as module. > In such a case we > could still push it in for 4.3 So it is a fix, it is great if this one can still go into 4.3. Best Regards, Josh Wu > > Thanks > Guennadi > > On Tue, 4 Aug 2015, Josh Wu wrote: > >> Since in soc_of_bind() it may use the of node's full name as the clk_name, >> and this full name may be longer than 32 characters, take at91 i2c sensor >> as an example, length is 34 bytes: >> /ahb/apb/i2c@f8028000/camera@0x30 >> >> So this patch increase the clk_name[] array size to 64. It seems big >> enough so far. >> >> Signed-off-by: Josh Wu <josh.wu@atmel.com> >> --- >> >> drivers/media/platform/soc_camera/soc_camera.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c >> index d708df4..fcf3e97 100644 >> --- a/drivers/media/platform/soc_camera/soc_camera.c >> +++ b/drivers/media/platform/soc_camera/soc_camera.c >> @@ -1621,7 +1621,7 @@ static int soc_of_bind(struct soc_camera_host *ici, >> struct soc_camera_async_client *sasc; >> struct soc_of_info *info; >> struct i2c_client *client; >> - char clk_name[V4L2_SUBDEV_NAME_SIZE]; >> + char clk_name[V4L2_SUBDEV_NAME_SIZE + 32]; >> int ret; >> >> /* allocate a new subdev and add match info to it */ >> -- >> 1.9.1 >> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index d708df4..fcf3e97 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -1621,7 +1621,7 @@ static int soc_of_bind(struct soc_camera_host *ici, struct soc_camera_async_client *sasc; struct soc_of_info *info; struct i2c_client *client; - char clk_name[V4L2_SUBDEV_NAME_SIZE]; + char clk_name[V4L2_SUBDEV_NAME_SIZE + 32]; int ret; /* allocate a new subdev and add match info to it */
Since in soc_of_bind() it may use the of node's full name as the clk_name, and this full name may be longer than 32 characters, take at91 i2c sensor as an example, length is 34 bytes: /ahb/apb/i2c@f8028000/camera@0x30 So this patch increase the clk_name[] array size to 64. It seems big enough so far. Signed-off-by: Josh Wu <josh.wu@atmel.com> --- drivers/media/platform/soc_camera/soc_camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)