diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /include/media/v4l2-device.h | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'include/media/v4l2-device.h')
| -rw-r--r-- | include/media/v4l2-device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 97b283a04289..9bf4ccc93dbf 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h | |||
| @@ -80,7 +80,7 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); | |||
| 80 | #define __v4l2_device_call_subdevs_until_err(dev, cond, o, f, args...) \ | 80 | #define __v4l2_device_call_subdevs_until_err(dev, cond, o, f, args...) \ |
| 81 | ({ \ | 81 | ({ \ |
| 82 | struct v4l2_subdev *sd; \ | 82 | struct v4l2_subdev *sd; \ |
| 83 | int err = 0; \ | 83 | long err = 0; \ |
| 84 | \ | 84 | \ |
| 85 | list_for_each_entry(sd, &(dev)->subdevs, list) { \ | 85 | list_for_each_entry(sd, &(dev)->subdevs, list) { \ |
| 86 | if ((cond) && sd->ops->o && sd->ops->o->f) \ | 86 | if ((cond) && sd->ops->o && sd->ops->o->f) \ |