[svn-commits] sruffell: linux/trunk r8111 - /linux/trunk/drivers/dahdi/voicebus/voicebus.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Feb 25 16:16:40 2010
New Revision: 8111

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8111
Log:
voicebus: Only use request_module_nowait on kernels >= 2.6.30.

Request_module_nowait is only useful when asynchronous initialization is used
(committed to trunk in r8094), and that can only happen in kernel version after
2.6.30.  Some earlier kernels do not have the request_module_nowait interface.

Modified:
    linux/trunk/drivers/dahdi/voicebus/voicebus.c

Modified: linux/trunk/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=8111&r1=8110&r2=8111
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/voicebus.c Thu Feb 25 16:16:40 2010
@@ -1569,12 +1569,16 @@
 	spin_unlock(&loader_list_lock);
 
 	if (!loader_present) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+		ret = request_module("dahdi_vpmadt032_loader");
+#else
 		/* If we use the blocking 'request_module' here and we are
 		 * loading the client boards with async_schedule we will hang
 		 * here. The module loader will wait for our asynchronous tasks
 		 * to finish, but we can't because we're waiting for the load
 		 * the finish. */
 		ret = request_module_nowait("dahdi_vpmadt032_loader");
+#endif
 		if (ret)
 			return ret;
 		stop = jiffies + HZ;