diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /drivers/net/wan | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/cosa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index cd8f04afed8f..b36bf96eb502 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
| @@ -907,6 +907,7 @@ static ssize_t cosa_write(struct file *file, | |||
| 907 | current->state = TASK_RUNNING; | 907 | current->state = TASK_RUNNING; |
| 908 | chan->tx_status = 1; | 908 | chan->tx_status = 1; |
| 909 | spin_unlock_irqrestore(&cosa->lock, flags); | 909 | spin_unlock_irqrestore(&cosa->lock, flags); |
| 910 | up(&chan->wsem); | ||
| 910 | return -ERESTARTSYS; | 911 | return -ERESTARTSYS; |
| 911 | } | 912 | } |
| 912 | } | 913 | } |