[svn-commits] tzafrir: branch 1.2 r2117 - /branches/1.2/xpp/xbus-core.c

[svn-commits at lists.digium.com]

Author: tzafrir
Date: Wed Feb  7 15:13:15 2007
New Revision: 2117

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2117
Log:
Fixed an incorrect merge of xpp/xbus-core.c .

Modified:
    branches/1.2/xpp/xbus-core.c

Modified: branches/1.2/xpp/xbus-core.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/xbus-core.c?view=diff&rev=2117&r1=2116&r2=2117
==============================================================================
--- branches/1.2/xpp/xbus-core.c (original)
+++ branches/1.2/xpp/xbus-core.c Wed Feb  7 15:13:15 2007
@@ -447,13 +447,6 @@
  */
 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 @@
 #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 @@
 	wake_up(&xbus->wait_for_xpd_initialization);
 out:
 	up_read(&xbus->in_use);
+	return ret;
 }