| Message ID | 1376756714-25479-43-git-send-email-ming.lei@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat 17 August 2013 18:25:07 Ming Lei wrote: > Complete() will be run with interrupt enabled, so change to > spin_lock_irqsave(). > > These functions may be called inside URB->complete(), so use > spin_lock_irqsave(). > > Cc: Mauro Carvalho Chehab <mchehab@redhat.com> > Cc: linux-media@vger.kernel.org > Signed-off-by: Ming Lei <ming.lei@canonical.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Note: Mauro needs to Ack this as well. It looks good to me, but I don't maintain dvb code. Regards, Hans > --- > drivers/media/dvb-core/dvb_demux.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c > index 3485655..58de441 100644 > --- a/drivers/media/dvb-core/dvb_demux.c > +++ b/drivers/media/dvb-core/dvb_demux.c > @@ -476,7 +476,9 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) > void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf, > size_t count) > { > - spin_lock(&demux->lock); > + unsigned long flags; > + > + spin_lock_irqsave(&demux->lock, flags); > > while (count--) { > if (buf[0] == 0x47) > @@ -484,7 +486,7 @@ void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf, > buf += 188; > } > > - spin_unlock(&demux->lock); > + spin_unlock_irqrestore(&demux->lock, flags); > } > > EXPORT_SYMBOL(dvb_dmx_swfilter_packets); > @@ -519,8 +521,9 @@ static inline void _dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, > { > int p = 0, i, j; > const u8 *q; > + unsigned long flags; > > - spin_lock(&demux->lock); > + spin_lock_irqsave(&demux->lock, flags); > > if (demux->tsbufp) { /* tsbuf[0] is now 0x47. */ > i = demux->tsbufp; > @@ -564,7 +567,7 @@ static inline void _dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, > } > > bailout: > - spin_unlock(&demux->lock); > + spin_unlock_irqrestore(&demux->lock, flags); > } > > void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count) > @@ -581,11 +584,13 @@ EXPORT_SYMBOL(dvb_dmx_swfilter_204); > > void dvb_dmx_swfilter_raw(struct dvb_demux *demux, const u8 *buf, size_t count) > { > - spin_lock(&demux->lock); > + unsigned long flags; > + > + spin_lock_irqsave(&demux->lock, flags); > > demux->feed->cb.ts(buf, count, NULL, 0, &demux->feed->feed.ts, DMX_OK); > > - spin_unlock(&demux->lock); > + spin_unlock_irqrestore(&demux->lock, flags); > } > EXPORT_SYMBOL(dvb_dmx_swfilter_raw); > > -- 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
diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index 3485655..58de441 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_demux.c @@ -476,7 +476,9 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf, size_t count) { - spin_lock(&demux->lock); + unsigned long flags; + + spin_lock_irqsave(&demux->lock, flags); while (count--) { if (buf[0] == 0x47) @@ -484,7 +486,7 @@ void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf, buf += 188; } - spin_unlock(&demux->lock); + spin_unlock_irqrestore(&demux->lock, flags); } EXPORT_SYMBOL(dvb_dmx_swfilter_packets); @@ -519,8 +521,9 @@ static inline void _dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, { int p = 0, i, j; const u8 *q; + unsigned long flags; - spin_lock(&demux->lock); + spin_lock_irqsave(&demux->lock, flags); if (demux->tsbufp) { /* tsbuf[0] is now 0x47. */ i = demux->tsbufp; @@ -564,7 +567,7 @@ static inline void _dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, } bailout: - spin_unlock(&demux->lock); + spin_unlock_irqrestore(&demux->lock, flags); } void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count) @@ -581,11 +584,13 @@ EXPORT_SYMBOL(dvb_dmx_swfilter_204); void dvb_dmx_swfilter_raw(struct dvb_demux *demux, const u8 *buf, size_t count) { - spin_lock(&demux->lock); + unsigned long flags; + + spin_lock_irqsave(&demux->lock, flags); demux->feed->cb.ts(buf, count, NULL, 0, &demux->feed->feed.ts, DMX_OK); - spin_unlock(&demux->lock); + spin_unlock_irqrestore(&demux->lock, flags); } EXPORT_SYMBOL(dvb_dmx_swfilter_raw);
Complete() will be run with interrupt enabled, so change to spin_lock_irqsave(). These functions may be called inside URB->complete(), so use spin_lock_irqsave(). Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: linux-media@vger.kernel.org Signed-off-by: Ming Lei <ming.lei@canonical.com> --- drivers/media/dvb-core/dvb_demux.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)