[svn-commits] sruffell: linux/trunk r8017 - /linux/trunk/drivers/dahdi/vpmadt032_loader/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Feb  9 19:15:19 2010
New Revision: 8017

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8017
Log:
vpmadt032: Do not print error message on timeout.

The error message will be printed higher up anyway and dev_err doesn't work
on < 2.6.18 in this module since this module isn't GPL.  Building against a
2.6.18 tree that was prepared with "make modules_prepare" wasn't enough to catch
this problem since modpost can't run against the tree like that.

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=310a922d4307ed38b37982a6f93b11fdf3b8dcb1

Modified:
    linux/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c

Modified: linux/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c?view=diff&rev=8017&r1=8016&r2=8017
==============================================================================
--- linux/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c (original)
+++ linux/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c Tue Feb  9 19:15:19 2010
@@ -116,11 +116,8 @@
 	pci_set_drvdata(vb->pdev, ctx);
 	old = vb->ops;
 	vb->ops = &loader_operations;
-	if (wait_for_completion_timeout(&ctx->done, HZ*2)) {
-		dev_err(&vb->pdev->dev,
-			"Timeout waiting for load in %s.\n", __func__);
+	if (wait_for_completion_timeout(&ctx->done, HZ*2))
 		ret = -EIO;
-	}
 	vb->ops = old;
 	pci_set_drvdata(vb->pdev, old_drvdata);
 	__vpmadt032_cleanup(ctx->pvt);