diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-01 05:22:55 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-01 05:22:55 +0000 |
| commit | 61cc6e4ac8324b1e38a5c3bb543d1d262552bb78 (patch) | |
| tree | f7bb41b90f90de1da1fd639af14ebe33b9a8c5f3 /xpp/card_fxs.c | |
| parent | b3764b4070cb7a595062bf986236eafc03a4ef0b (diff) | |
Merging from 1.2:
* Removing -DSOFT_RING: unused, useless code.
* Register init scripts are not as noisy by default.
* Register init scripts read configuration from a standard location.
* Fixed a FXO spinlock race.
(Log was lost on previos merge)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1680 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/card_fxs.c')
| -rw-r--r-- | xpp/card_fxs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xpp/card_fxs.c b/xpp/card_fxs.c index 3d659fa..b5c6538 100644 --- a/xpp/card_fxs.c +++ b/xpp/card_fxs.c @@ -343,7 +343,7 @@ static int FXS_card_zaptel_preregistration(xpd_t *xpd, bool on) spin_unlock_irqrestore(&xpd->lock, flags); for_each_line(xpd, i) { MARK_LED(priv, i, color, LED_ON); - mdelay(50); + msleep(50); } return 0; } @@ -363,7 +363,7 @@ static int FXS_card_zaptel_postregistration(xpd_t *xpd, bool on) DBG("%s/%s (%d)\n", xbus->busname, xpd->xpdname, on); for_each_line(xpd, i) { MARK_LED(priv, i, color, LED_OFF); - mdelay(50); + msleep(50); } return 0; } @@ -946,7 +946,7 @@ static int proc_xpd_register_write(struct file *file, const char __user *buffer, ret = handle_register_command(xpd, buf); if(ret < 0) return ret; - mdelay(1); + msleep(1); } return count; } |