Skip to contentSkip to conversation

video/sn9c102: improve error handling

PATCH In review Dan Carpenter 2 participants 3 messages Mar 28, 2010

Subsystems (2)
Media (V4L/DVB) Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 video/sn9c102: improve error handling

Return an error if the controller is not found.

Signed-off-by Dan Carpenter <[email protected]>
drivers/media/video/sn9c102/sn9c102_core.c +4 -2
index cbf8087..28e19da 100644
@@ -2295,7 +2295,7 @@ sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam, void __user * arg)
 	if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
 		return -EFAULT;
 
-	for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+	for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) {
 		if (ctrl.id = s->qctrl[i].id) {
 			if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED)
 				return -EINVAL;

@@ -2305,7 +2305,9 @@ sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam, void __user * arg)
 			ctrl.value -= ctrl.value % s->qctrl[i].step;
 			break;
 		}
-
+	}
+	if (i = ARRAY_SIZE(s->qctrl))
+		return -EINVAL;
 	if ((err = s->set_ctrl(cam, &ctrl)))
 		return err;
#1 lore raw

Hi,

this patch seems incomplete.

You had an opening { wityhout the corresponding }.

Best regards,
Christophe Jaillet.

"Dan Carpenter" <[email protected]> a écrit dans le message de news:20100328115005.GW5069@bicker...

Quoted 3 lines

Return an error if the controller is not found.

Signed-off-by Dan Carpenter

<[email protected]>

Review

Quoted 2 lines
(quoted diff) +0 -0

b/drivers/media/video/sn9c102/sn9c102_core.c

drivers/media/video/sn9c102/sn9c102_core.c sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam,

Quoted 4 lines

index cbf8087..28e19da 100644

drivers/media/video/sn9c102/sn9c102_core.c +0 -0
@@ -2295,7 +2295,7 @@ sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam,

void __user * arg)

drivers/media/video/sn9c102/sn9c102_core.c sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam,

Quoted 9 lines
drivers/media/video/sn9c102/sn9c102_core.c +1 -1
  if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
  return -EFAULT;
 
- for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+ for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) {
  if (ctrl.id = s->qctrl[i].id) {
  if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED)
  return -EINVAL;

@@ -2305,7 +2305,9 @@ sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam,

void __user * arg)

drivers/media/video/sn9c102/sn9c102_core.c sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam, void __user * arg) · line 2307

Quoted 3 lines
drivers/media/video/sn9c102/sn9c102_core.c +0 -0
  ctrl.value -= ctrl.value % s->qctrl[i].step;
  break;
  }

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#2 lore raw
Quoted 5 lines · Christophe JAILLET

Hi,

this patch seems incomplete.

You had an opening { wityhout the corresponding }.

It must be an issue with the mail server on your end. :/

Here is a url you can download it from.
http://lkml.org/lkml/2010/3/28/43

Unfortunately, lkml.org puts some white space on the end of diffs. Patch complains but it still applies them fine.

regards,
dan carpenter