* [patch] [media] davinci: vpif: missing unlocks on error
@ 2014-06-11 7:31 Dan Carpenter
2014-06-11 9:44 ` Prabhakar Lad
0 siblings, 1 reply; 6+ messages in thread
From: Dan Carpenter @ 2014-06-11 7:31 UTC (permalink / raw)
To: Lad, Prabhakar
Cc: Mauro Carvalho Chehab, linux-media, davinci-linux-open-source,
kernel-janitors
We recently changed some locking around so we need some new unlocks on
the error paths.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Please review this one carefully. I don't know if the unlock should go
before or after the list_for_each_entry_safe() loop.
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index a7ed164..2c08fbd 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -265,6 +265,8 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
return 0;
err:
+ spin_unlock_irqrestore(&common->irqlock, flags);
+
list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 5bb085b..b7b2bdf 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -229,6 +229,8 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
return 0;
err:
+ spin_unlock_irqrestore(&common->irqlock, flags);
+
list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch] [media] davinci: vpif: missing unlocks on error
2014-06-11 7:31 [patch] [media] davinci: vpif: missing unlocks on error Dan Carpenter
@ 2014-06-11 9:44 ` Prabhakar Lad
2014-06-12 7:01 ` [patch v2] " Dan Carpenter
0 siblings, 1 reply; 6+ messages in thread
From: Prabhakar Lad @ 2014-06-11 9:44 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Mauro Carvalho Chehab, linux-media, dlos, kernel-janitors
Hi Dan,
Thanks for the patch.
On Wed, Jun 11, 2014 at 8:31 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> We recently changed some locking around so we need some new unlocks on
> the error paths.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> Please review this one carefully. I don't know if the unlock should go
> before or after the list_for_each_entry_safe() loop.
>
Yes the unlock should go after the list_for_each_entry_safe() loop
please respin another version fixing it.
Thanks,
--Prabhakar Lad
> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
> index a7ed164..2c08fbd 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -265,6 +265,8 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
> return 0;
>
> err:
> + spin_unlock_irqrestore(&common->irqlock, flags);
> +
> list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
> list_del(&buf->list);
> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
> diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
> index 5bb085b..b7b2bdf 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -229,6 +229,8 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
> return 0;
>
> err:
> + spin_unlock_irqrestore(&common->irqlock, flags);
> +
> list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
> list_del(&buf->list);
> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch v2] [media] davinci: vpif: missing unlocks on error
2014-06-11 9:44 ` Prabhakar Lad
@ 2014-06-12 7:01 ` Dan Carpenter
2014-06-13 18:13 ` Prabhakar Lad
0 siblings, 1 reply; 6+ messages in thread
From: Dan Carpenter @ 2014-06-12 7:01 UTC (permalink / raw)
To: Lad, Prabhakar
Cc: Mauro Carvalho Chehab, linux-media, davinci-linux-open-source,
kernel-janitors
We recently changed some locking around so we need some new unlocks on
the error paths.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: move the unlock so the list_for_each_entry_safe() loop is protected
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index a7ed164..1e4ec69 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -269,6 +269,7 @@ err:
list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
}
+ spin_unlock_irqrestore(&common->irqlock, flags);
return ret;
}
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 5bb085b..b431b58 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -233,6 +233,7 @@ err:
list_del(&buf->list);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
}
+ spin_unlock_irqrestore(&common->irqlock, flags);
return ret;
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch v2] [media] davinci: vpif: missing unlocks on error
2014-06-12 7:01 ` [patch v2] " Dan Carpenter
@ 2014-06-13 18:13 ` Prabhakar Lad
2014-06-16 9:48 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Prabhakar Lad @ 2014-06-13 18:13 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Mauro Carvalho Chehab, linux-media, dlos, kernel-janitors
On Thu, Jun 12, 2014 at 8:01 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> We recently changed some locking around so we need some new unlocks on
> the error paths.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied!
Thanks,
--Prabhakar Lad
> ---
> v2: move the unlock so the list_for_each_entry_safe() loop is protected
>
> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
> index a7ed164..1e4ec69 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -269,6 +269,7 @@ err:
> list_del(&buf->list);
> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
> }
> + spin_unlock_irqrestore(&common->irqlock, flags);
>
> return ret;
> }
> diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
> index 5bb085b..b431b58 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -233,6 +233,7 @@ err:
> list_del(&buf->list);
> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
> }
> + spin_unlock_irqrestore(&common->irqlock, flags);
>
> return ret;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch v2] [media] davinci: vpif: missing unlocks on error
2014-06-13 18:13 ` Prabhakar Lad
@ 2014-06-16 9:48 ` Hans Verkuil
2014-06-16 11:07 ` Prabhakar Lad
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2014-06-16 9:48 UTC (permalink / raw)
To: Prabhakar Lad, Dan Carpenter
Cc: Mauro Carvalho Chehab, linux-media, dlos, kernel-janitors
Prabhakar,
Are you going to make a pull request for this, or shall I take it? Should it be applied
to 3.16?
Regards,
Hans
On 06/13/2014 08:13 PM, Prabhakar Lad wrote:
> On Thu, Jun 12, 2014 at 8:01 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
>> We recently changed some locking around so we need some new unlocks on
>> the error paths.
>>
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Applied!
>
> Thanks,
> --Prabhakar Lad
>
>> ---
>> v2: move the unlock so the list_for_each_entry_safe() loop is protected
>>
>> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
>> index a7ed164..1e4ec69 100644
>> --- a/drivers/media/platform/davinci/vpif_capture.c
>> +++ b/drivers/media/platform/davinci/vpif_capture.c
>> @@ -269,6 +269,7 @@ err:
>> list_del(&buf->list);
>> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
>> }
>> + spin_unlock_irqrestore(&common->irqlock, flags);
>>
>> return ret;
>> }
>> diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
>> index 5bb085b..b431b58 100644
>> --- a/drivers/media/platform/davinci/vpif_display.c
>> +++ b/drivers/media/platform/davinci/vpif_display.c
>> @@ -233,6 +233,7 @@ err:
>> list_del(&buf->list);
>> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
>> }
>> + spin_unlock_irqrestore(&common->irqlock, flags);
>>
>> return ret;
>> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch v2] [media] davinci: vpif: missing unlocks on error
2014-06-16 9:48 ` Hans Verkuil
@ 2014-06-16 11:07 ` Prabhakar Lad
0 siblings, 0 replies; 6+ messages in thread
From: Prabhakar Lad @ 2014-06-16 11:07 UTC (permalink / raw)
To: Hans Verkuil
Cc: Dan Carpenter, Mauro Carvalho Chehab, linux-media, dlos, kernel-janitors
Hi Hans,
On Mon, Jun 16, 2014 at 10:48 AM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> Prabhakar,
>
> Are you going to make a pull request for this, or shall I take it? Should it be applied
> to 3.16?
>
As this is not a critical bug, I was planning to wait for v3.17 as
v3.16 is almost closed.
Regards,
--Prabhakar Lad
> Regards,
>
> Hans
>
> On 06/13/2014 08:13 PM, Prabhakar Lad wrote:
>> On Thu, Jun 12, 2014 at 8:01 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
>>> We recently changed some locking around so we need some new unlocks on
>>> the error paths.
>>>
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>
>> Applied!
>>
>> Thanks,
>> --Prabhakar Lad
>>
>>> ---
>>> v2: move the unlock so the list_for_each_entry_safe() loop is protected
>>>
>>> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
>>> index a7ed164..1e4ec69 100644
>>> --- a/drivers/media/platform/davinci/vpif_capture.c
>>> +++ b/drivers/media/platform/davinci/vpif_capture.c
>>> @@ -269,6 +269,7 @@ err:
>>> list_del(&buf->list);
>>> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
>>> }
>>> + spin_unlock_irqrestore(&common->irqlock, flags);
>>>
>>> return ret;
>>> }
>>> diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
>>> index 5bb085b..b431b58 100644
>>> --- a/drivers/media/platform/davinci/vpif_display.c
>>> +++ b/drivers/media/platform/davinci/vpif_display.c
>>> @@ -233,6 +233,7 @@ err:
>>> list_del(&buf->list);
>>> vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
>>> }
>>> + spin_unlock_irqrestore(&common->irqlock, flags);
>>>
>>> return ret;
>>> }
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-media" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-16 11:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-11 7:31 [patch] [media] davinci: vpif: missing unlocks on error Dan Carpenter
2014-06-11 9:44 ` Prabhakar Lad
2014-06-12 7:01 ` [patch v2] " Dan Carpenter
2014-06-13 18:13 ` Prabhakar Lad
2014-06-16 9:48 ` Hans Verkuil
2014-06-16 11:07 ` Prabhakar Lad
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).