diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-07 21:13:15 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-07 21:13:15 +0000 |
commit | f0c640e9744f955d52f11ffba02d2397f0c23cfe (patch) | |
tree | 11c6dc200629524e135ac67d9d9447df32ab667b /xpp | |
parent | 7390517c93aca1cf2feadfbb584d40bca34748a9 (diff) |
Fixed an incorrect merge of xpp/xbus-core.c .
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2117 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp')
-rw-r--r-- | xpp/xbus-core.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xpp/xbus-core.c b/xpp/xbus-core.c index dc5c812..5260804 100644 --- a/xpp/xbus-core.c +++ b/xpp/xbus-core.c @@ -447,13 +447,6 @@ out: */ static int xbus_poll(WORK_DATA *data) { - xbus_t *xbus = container_of(work, xbus_t, xpds_init_work); -#else -static void xbus_poll(void *data) -{ - xbus_t *xbus = data; -#endif - int id; int ret = 0; unsigned long flags; @@ -472,7 +465,7 @@ static void xbus_poll(void *data) #endif if(!down_read_trylock(&xbus->in_use)) { ERR("%s is being removed...\n", xbus->busname); - return; + return -EBUSY; } msleep(2); /* roundtrip for older polls */ spin_lock_irqsave(&xbus->lock, flags); @@ -571,6 +564,7 @@ static void xbus_poll(void *data) wake_up(&xbus->wait_for_xpd_initialization); out: up_read(&xbus->in_use); + return ret; } |