diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-02-10 01:15:19 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-02-10 01:15:19 +0000 |
| commit | 67f36b02c107d6d164b6744122b668eb1394e9bc (patch) | |
| tree | 2c14320ef5e41635983b9dcebf357c10a77c02d9 | |
| parent | de76afabf2e413a149ae0ef0477bd64e71b3bc0d (diff) | |
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
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8017 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c b/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c index f895343..b0b9286 100644 --- a/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c +++ b/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c @@ -116,11 +116,8 @@ static int vpmadt032_load_firmware(struct voicebus *vb) 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); |