[svn-commits] sruffell: linux/trunk r8156 - /linux/trunk/drivers/dahdi/wcte12xp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Feb 26 17:14:40 2010
New Revision: 8156

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8156
Log:
wcte12xp: Fix for a couple of issues introduced in recent commits.

handle_transmit was clearing out the wrong size value and checking for timeouts
wasn't handled correctly.

Modified:
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=8156&r1=8155&r2=8156
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Fri Feb 26 17:14:40 2010
@@ -576,7 +576,7 @@
 	cmd->flags = __CMD_RD;
 	submit_cmd(wc, cmd);
 	ret = wait_for_completion_timeout(&cmd->complete, HZ/5);
-	if (unlikely(ret)) {
+	if (unlikely(!ret)) {
 		if (printk_ratelimit()) {
 			dev_warn(&wc->vb.pdev->dev,
 				 "Timeout in %s\n", __func__);
@@ -616,7 +616,7 @@
 	cmd->flags = __CMD_PINS;
 	submit_cmd(wc, cmd);
 	ret = wait_for_completion_timeout(&cmd->complete, HZ/5);
-	if (unlikely(ret)) {
+	if (unlikely(!ret)) {
 		if (printk_ratelimit()) {
 			dev_warn(&wc->vb.pdev->dev,
 				 "Timeout in %s\n", __func__);
@@ -1750,7 +1750,7 @@
 	struct vbb *vbb;
 
 	list_for_each_entry(vbb, buffers, entry) {
-		memset(vbb, 0, SFRAME_SIZE);
+		memset(vbb->data, 0, sizeof(vbb->data));
 		atomic_inc(&wc->txints);
 		t1_transmitprep(wc, vbb->data);
 		handle_leds(wc);