2011-03-26 18:20:35

by Mariusz Kozlowski

Subject: [PATCH] [media] cpia2: fix typo in variable initialisation

Currently 'fh' initialises to whatever happens to be on stack. This
looks like a typo and this patch fixes that.

Signed-off-by: Mariusz Kozlowski <[email protected]>
---
drivers/media/video/cpia2/cpia2_v4l.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 5111bbc..0073a8c 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -1313,7 +1313,7 @@ static int cpia2_g_priority(struct file *file, void *_fh, enum v4l2_priority *p)
static int cpia2_s_priority(struct file *file, void *_fh, enum v4l2_priority prio)
{
struct camera_data *cam = video_drvdata(file);
- struct cpia2_fh *fh = fh;
+ struct cpia2_fh *fh = _fh;

if (cam->streaming && prio != fh->prio &&
fh->prio == V4L2_PRIORITY_RECORD)
--
1.7.0.4

2011-03-26 18:29:33

by Hans Verkuil

Subject: Re: [PATCH] [media] cpia2: fix typo in variable initialisation

Hi Mariusz,

On Saturday, March 26, 2011 19:20:24 Mariusz Kozlowski wrote:
> Currently 'fh' initialises to whatever happens to be on stack. This
> looks like a typo and this patch fixes that.
>
> Signed-off-by: Mariusz Kozlowski <[email protected]>

If you don't mind then I'll take this patch. Although I'll probably drop it,
not because it is wrong as such but because the priority handling in cpia2
is broken big time. I intend to rewrite it using the new prio framework that
was just merged.

Luckily I finally found someone who can test this driver, so that should be
very helpful.

I hope to work on this next weekend.

Regards,

Hans

> ---
> drivers/media/video/cpia2/cpia2_v4l.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
> index 5111bbc..0073a8c 100644
> --- a/drivers/media/video/cpia2/cpia2_v4l.c
> +++ b/drivers/media/video/cpia2/cpia2_v4l.c
> @@ -1313,7 +1313,7 @@ static int cpia2_g_priority(struct file *file, void *_fh, enum v4l2_priority *p)
> static int cpia2_s_priority(struct file *file, void *_fh, enum v4l2_priority prio)
> {
> struct camera_data *cam = video_drvdata(file);
> - struct cpia2_fh *fh = fh;
> + struct cpia2_fh *fh = _fh;
>
> if (cam->streaming && prio != fh->prio &&
> fh->prio == V4L2_PRIORITY_RECORD)
>