diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-23 12:23:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-23 12:23:45 -0700 |
| commit | b0d19a378a409373244088511e889957645f2a44 (patch) | |
| tree | 25275409eeea845f2e7617f12c8f28801ee4198f /drivers/net/hamradio | |
| parent | 0093cb1199ec551f179562ca9fbd6f64fb750645 (diff) | |
| parent | d7d313000ba2fc94a5383511a17ff38a39bab928 (diff) | |
| download | linux-3.10-b0d19a378a409373244088511e889957645f2a44.tar.gz linux-3.10-b0d19a378a409373244088511e889957645f2a44.tar.bz2 linux-3.10-b0d19a378a409373244088511e889957645f2a44.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
iwlwifi: Fix built-in compilation of iwlcore
net: Unexport move_addr_to_{kernel,user}
rt2x00: Select LEDS_CLASS.
iwlwifi: Select LEDS_CLASS.
leds: Do not guard NEW_LEDS with HAS_IOMEM
[IPSEC]: Fix catch-22 with algorithm IDs above 31
time: Export set_normalized_timespec.
tcp: Make use of before macro in tcp_input.c
hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
[NETNS]: Remove empty ->init callback.
[DCCP]: Convert do_gettimeofday() to getnstimeofday().
[NETNS]: Don't initialize err variable twice.
[NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.
[IPV4]: Convert do_gettimeofday() to getnstimeofday().
[IPV4]: Make icmp_sk_init() static.
[IPV6]: Make struct ip6_prohibit_entry_template static.
tcp: Trivial fix to correct function name in a comment in net/ipv4/tcp.c
[NET]: Expose netdevice dev_id through sysfs
skbuff: fix missing kernel-doc notation
[ROSE]: Fix soft lockup wrt. rose_node_list_lock
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/dmascc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index e04bf992644..0b94833e23f 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c @@ -1083,15 +1083,12 @@ static void start_timer(struct scc_priv *priv, int t, int r15) if (t == 0) { tm_isr(priv); } else if (t > 0) { - save_flags(flags); - cli(); outb(t & 0xFF, priv->tmr_cnt); outb((t >> 8) & 0xFF, priv->tmr_cnt); if (priv->type != TYPE_TWIN) { write_scc(priv, R15, r15 | CTSIE); priv->rr0 |= CTS; } - restore_flags(flags); } } |