| Message ID | 1373533573-12272-6-git-send-email-ming.lei@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 11-07-2013 13:05, Ming Lei wrote: > Complete() will be run with interrupt enabled, so change to > spin_lock_irqsave(). > Signed-off-by: Ming Lei <ming.lei@canonical.com> > --- > drivers/usb/misc/uss720.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c > index e129cf6..f7d15e8 100644 > --- a/drivers/usb/misc/uss720.c > +++ b/drivers/usb/misc/uss720.c > @@ -121,6 +121,7 @@ static void async_complete(struct urb *urb) > dev_err(&urb->dev->dev, "async_complete: urb error %d\n", > status); > } else if (rq->dr.bRequest == 3) { > + unsigned long flags; Empty line wouldn't hurt here, after declaration. > memcpy(priv->reg, rq->reg, sizeof(priv->reg)); WBR, Sergei -- 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/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index e129cf6..f7d15e8 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c @@ -121,6 +121,7 @@ static void async_complete(struct urb *urb) dev_err(&urb->dev->dev, "async_complete: urb error %d\n", status); } else if (rq->dr.bRequest == 3) { + unsigned long flags; memcpy(priv->reg, rq->reg, sizeof(priv->reg)); #if 0 dev_dbg(&priv->usbdev->dev, @@ -131,8 +132,11 @@ static void async_complete(struct urb *urb) (unsigned int)priv->reg[6]); #endif /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ - if (rq->reg[2] & rq->reg[1] & 0x10 && pp) + if (rq->reg[2] & rq->reg[1] & 0x10 && pp) { + local_irq_save(flags); parport_generic_irq(pp); + local_irq_restore(flags); + } } complete(&rq->compl); kref_put(&rq->ref_count, destroy_async);
Complete() will be run with interrupt enabled, so change to spin_lock_irqsave(). Signed-off-by: Ming Lei <ming.lei@canonical.com> --- drivers/usb/misc/uss720.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)