[PATCH 1/3] [media] s5k5baf: Fix build warning

[PATCH 1/3] [media] s5k5baf: Fix build warning

[Sachin Kamat]

Fixes the following warnings:
drivers/media/i2c/s5k5baf.c: In function 's5k5baf_fw_parse':
drivers/media/i2c/s5k5baf.c:362:3: warning:
format '%d' expects argument of type 'int', but argument 3 has type 'size_t' [-Wformat=]
drivers/media/i2c/s5k5baf.c:383:4: warning:
format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
---
 drivers/media/i2c/s5k5baf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
index e3b44a87460b..139bdd4f5dde 100644
--- a/drivers/media/i2c/s5k5baf.c
+++ b/drivers/media/i2c/s5k5baf.c
@@ -359,7 +359,7 @@ static int s5k5baf_fw_parse(struct device *dev, struct s5k5baf_fw **fw,
 	int ret;
 
 	if (count < S5K5BAG_FW_TAG_LEN + 1) {
-		dev_err(dev, "firmware file too short (%d)\n", count);
+		dev_err(dev, "firmware file too short (%zu)\n", count);
 		return -EINVAL;
 	}
 
@@ -379,7 +379,7 @@ static int s5k5baf_fw_parse(struct device *dev, struct s5k5baf_fw **fw,
 
 	f = (struct s5k5baf_fw *)d;
 	if (count < 1 + 2 * f->count) {
-		dev_err(dev, "invalid firmware header (count=%d size=%d)\n",
+		dev_err(dev, "invalid firmware header (count=%d size=%zu)\n",
 			f->count, 2 * (count + S5K5BAG_FW_TAG_LEN));
 		return -EINVAL;
 	}
-- 
1.7.9.5

[PATCH 2/3] [media] s5k5baf: Fix checkpatch error

[Sachin Kamat]

Fixes the following error:
ERROR: return is not a function, parentheses are not required
FILE: drivers/media/i2c/s5k5baf.c:1353:

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/i2c/s5k5baf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
index 139bdd4f5dde..974b865c2ee1 100644
--- a/drivers/media/i2c/s5k5baf.c
+++ b/drivers/media/i2c/s5k5baf.c
@@ -1350,8 +1350,8 @@ static enum selection_rect s5k5baf_get_sel_rect(u32 pad, u32 target)
 
 static int s5k5baf_is_bound_target(u32 target)
 {
-	return (target == V4L2_SEL_TGT_CROP_BOUNDS ||
-		target == V4L2_SEL_TGT_COMPOSE_BOUNDS);
+	return target == V4L2_SEL_TGT_CROP_BOUNDS ||
+		target == V4L2_SEL_TGT_COMPOSE_BOUNDS;
 }
 
 static int s5k5baf_get_selection(struct v4l2_subdev *sd,
-- 
1.7.9.5

[PATCH 3/3] [media] s5k5baf: Fix potential NULL pointer dereferencing

[Sachin Kamat]

Dereference 'fw' after the NULL check.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/i2c/s5k5baf.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
index 974b865c2ee1..4b8381111cbd 100644
--- a/drivers/media/i2c/s5k5baf.c
+++ b/drivers/media/i2c/s5k5baf.c
@@ -548,12 +548,14 @@ static void s5k5baf_synchronize(struct s5k5baf *state, int timeout, u16 addr)
 static u16 *s5k5baf_fw_get_seq(struct s5k5baf *state, u16 seq_id)
 {
 	struct s5k5baf_fw *fw = state->fw;
-	u16 *data = fw->data + 2 * fw->count;
+	u16 *data;
 	int i;
 
 	if (fw == NULL)
 		return NULL;
 
+	data = fw->data + 2 * fw->count;
+
 	for (i = 0; i < fw->count; ++i) {
 		if (fw->seq[i].id == seq_id)
 			return data + fw->seq[i].offset;
-- 
1.7.9.5

Re: [PATCH 1/3] [media] s5k5baf: Fix build warning

[Sachin Kamat]

On 24 December 2013 17:12, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> Fixes the following warnings:
> drivers/media/i2c/s5k5baf.c: In function 's5k5baf_fw_parse':
> drivers/media/i2c/s5k5baf.c:362:3: warning:
> format '%d' expects argument of type 'int', but argument 3 has type 'size_t' [-Wformat=]
> drivers/media/i2c/s5k5baf.c:383:4: warning:
> format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> ---
>  drivers/media/i2c/s5k5baf.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index e3b44a87460b..139bdd4f5dde 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -359,7 +359,7 @@ static int s5k5baf_fw_parse(struct device *dev, struct s5k5baf_fw **fw,
>         int ret;
>
>         if (count < S5K5BAG_FW_TAG_LEN + 1) {
> -               dev_err(dev, "firmware file too short (%d)\n", count);
> +               dev_err(dev, "firmware file too short (%zu)\n", count);
>                 return -EINVAL;
>         }
>
> @@ -379,7 +379,7 @@ static int s5k5baf_fw_parse(struct device *dev, struct s5k5baf_fw **fw,
>
>         f = (struct s5k5baf_fw *)d;
>         if (count < 1 + 2 * f->count) {
> -               dev_err(dev, "invalid firmware header (count=%d size=%d)\n",
> +               dev_err(dev, "invalid firmware header (count=%d size=%zu)\n",
>                         f->count, 2 * (count + S5K5BAG_FW_TAG_LEN));
>                 return -EINVAL;
>         }
> --
> 1.7.9.5
>

Gentle ping on this series :)

-- 
With warm regards,
Sachin

Re: [PATCH 1/3] [media] s5k5baf: Fix build warning

[Andrzej Hajda]

On 01/06/2014 12:48 PM, Sachin Kamat wrote:
Hi Sachin,

Thanks for the fixes.

> Gentle ping on this series :) 

Sorry for late reply, but it seems Mauro has merged them already.

Regards
Andrzej

Re: [PATCH 1/3] [media] s5k5baf: Fix build warning

[Sachin Kamat]

Hi Andrzej,

On 8 January 2014 16:30, Andrzej Hajda <a.hajda@samsung.com> wrote:
> On 01/06/2014 12:48 PM, Sachin Kamat wrote:
> Hi Sachin,
>
> Thanks for the fixes.
>
>> Gentle ping on this series :)
>
> Sorry for late reply, but it seems Mauro has merged them already.

No worries. Yes, Mauro has queued them for 3.14.

-- 
With warm regards,
Sachin