diff mbox

drivers/media: vsp1_video: fix compile error

Message ID 1452816583-11036-1-git-send-email-anders.roxell@linaro.org (mailing list archive)
State Accepted
Delegated to: Geert Uytterhoeven
Headers show

Commit Message

Anders Roxell Jan. 15, 2016, 12:09 a.m. UTC
This was found with the -RT patch enabled, but the fix should apply to
non-RT also.

Compilation error without this fix:
../drivers/media/platform/vsp1/vsp1_video.c: In function
'vsp1_pipeline_stopped':
../drivers/media/platform/vsp1/vsp1_video.c:524:2: error: expected
expression before 'do'
  spin_unlock_irqrestore(&pipe->irqlock, flags);
    ^

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 drivers/media/platform/vsp1/vsp1_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Laurent Pinchart Jan. 24, 2016, 10:15 p.m. UTC | #1
Hi Anders,

Thank you for the patch.

On Friday 15 January 2016 01:09:43 Anders Roxell wrote:
> This was found with the -RT patch enabled, but the fix should apply to
> non-RT also.
> 
> Compilation error without this fix:
> ../drivers/media/platform/vsp1/vsp1_video.c: In function
> 'vsp1_pipeline_stopped':
> ../drivers/media/platform/vsp1/vsp1_video.c:524:2: error: expected
> expression before 'do'
>   spin_unlock_irqrestore(&pipe->irqlock, flags);
>     ^
> 
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

and applied to my tree.

> ---
>  drivers/media/platform/vsp1/vsp1_video.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/vsp1/vsp1_video.c
> b/drivers/media/platform/vsp1/vsp1_video.c index 637d0d6..b4dca57 100644
> --- a/drivers/media/platform/vsp1/vsp1_video.c
> +++ b/drivers/media/platform/vsp1/vsp1_video.c
> @@ -515,7 +515,7 @@ static bool vsp1_pipeline_stopped(struct vsp1_pipeline
> *pipe) bool stopped;
> 
>  	spin_lock_irqsave(&pipe->irqlock, flags);
> -	stopped = pipe->state == VSP1_PIPELINE_STOPPED,
> +	stopped = pipe->state == VSP1_PIPELINE_STOPPED;
>  	spin_unlock_irqrestore(&pipe->irqlock, flags);
> 
>  	return stopped;
Mauro Carvalho Chehab Jan. 25, 2016, 11:14 a.m. UTC | #2
Em Mon, 25 Jan 2016 00:15:28 +0200
Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu:

> Hi Anders,
> 
> Thank you for the patch.
> 
> On Friday 15 January 2016 01:09:43 Anders Roxell wrote:
> > This was found with the -RT patch enabled, but the fix should apply to
> > non-RT also.
> > 
> > Compilation error without this fix:
> > ../drivers/media/platform/vsp1/vsp1_video.c: In function
> > 'vsp1_pipeline_stopped':
> > ../drivers/media/platform/vsp1/vsp1_video.c:524:2: error: expected
> > expression before 'do'
> >   spin_unlock_irqrestore(&pipe->irqlock, flags);
> >     ^
> > 
> > Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> and applied to my tree.

Better to apply this to the fixes branch and send it together with
the next set of patches upstream.

> 
> > ---
> >  drivers/media/platform/vsp1/vsp1_video.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/media/platform/vsp1/vsp1_video.c
> > b/drivers/media/platform/vsp1/vsp1_video.c index 637d0d6..b4dca57 100644
> > --- a/drivers/media/platform/vsp1/vsp1_video.c
> > +++ b/drivers/media/platform/vsp1/vsp1_video.c
> > @@ -515,7 +515,7 @@ static bool vsp1_pipeline_stopped(struct vsp1_pipeline
> > *pipe) bool stopped;
> > 
> >  	spin_lock_irqsave(&pipe->irqlock, flags);
> > -	stopped = pipe->state == VSP1_PIPELINE_STOPPED,
> > +	stopped = pipe->state == VSP1_PIPELINE_STOPPED;
> >  	spin_unlock_irqrestore(&pipe->irqlock, flags);
> > 
> >  	return stopped;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index 637d0d6..b4dca57 100644
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -515,7 +515,7 @@  static bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe)
 	bool stopped;
 
 	spin_lock_irqsave(&pipe->irqlock, flags);
-	stopped = pipe->state == VSP1_PIPELINE_STOPPED,
+	stopped = pipe->state == VSP1_PIPELINE_STOPPED;
 	spin_unlock_irqrestore(&pipe->irqlock, flags);
 
 	return stopped;