summaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-31 00:10:35 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-31 00:10:35 -0700
commit92b4522f72916ff2675060e29e4b24cf26ab59ce (patch)
tree8424a1c550a98ce09f127425fde9b7b5f2f5027a /drivers/isdn
parent67a3e12b05e055c0415c556a315a3d3eb637e29e (diff)
parent2903037400a26e7c0cc93ab75a7d62abfacdf485 (diff)
downloadlinux-92b4522f72916ff2675060e29e4b24cf26ab59ce.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/hardware/mISDN/hfcsusb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index b3b7e2879bac..8700474747e8 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -97,8 +97,10 @@ static int write_reg(struct hfcsusb *hw, __u8 reg, __u8 val)
hw->name, __func__, reg, val);
spin_lock(&hw->ctrl_lock);
- if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE)
+ if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE) {
+ spin_unlock(&hw->ctrl_lock);
return 1;
+ }
buf = &hw->ctrl_buff[hw->ctrl_in_idx];
buf->hfcs_reg = reg;
buf->reg_val = val;