From 4c4de04a0bee2704246f828d6198aa27d38f597e Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Mon, 25 Jun 2012 17:15:47 +0200 Subject: [PATCH] --- yaml --- r: 317539 b: refs/heads/master c: 59d6a29e554d891a513476c13a6657825f8be270 h: refs/heads/master i: 317537: 30a25223d23553e77653ff9de0c4d2a66ba248fc 317535: 65fbbcc3a0482524f2d404463d208a74a49251e6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/devices/ipoctal.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9d45fd9e6c5..e92514637dcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bae8bd165ae3fee0573eb7eb377a479cf26e4277 +refs/heads/master: 59d6a29e554d891a513476c13a6657825f8be270 diff --git a/trunk/drivers/staging/ipack/devices/ipoctal.c b/trunk/drivers/staging/ipack/devices/ipoctal.c index b11126dfc006..ec7b2f9c89ad 100644 --- a/trunk/drivers/staging/ipack/devices/ipoctal.c +++ b/trunk/drivers/staging/ipack/devices/ipoctal.c @@ -299,7 +299,7 @@ static int ipoctal_irq_handler(void *arg) ipoctal->nb_bytes[channel] = 0; continue; } - spin_lock(&ipoctal->lock[channel]); + value = ipoctal->tty_port[channel].xmit_buf[*pointer_write]; ipoctal_write_io_reg(ipoctal, &ipoctal->chan_regs[channel].u.w.thr, @@ -309,7 +309,6 @@ static int ipoctal_irq_handler(void *arg) (*pointer_write)++; *pointer_write = *pointer_write % PAGE_SIZE; ipoctal->nb_bytes[channel]--; - spin_unlock(&ipoctal->lock[channel]); if ((ipoctal->nb_bytes[channel] == 0) && (waitqueue_active(&ipoctal->queue[channel]))) {