[svn-commits] sruffell: branch linux/2.4 r9684 - /linux/branches/2.4/drivers/dahdi/voicebus/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Jan 20 23:31:43 2011
New Revision: 9684

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9684
Log:
wctdm24xxp, wcte12xp: Add more descriptive message on a failed reset.

Reading 0xffffffff from the registers is a different error than just not
coming out of reset.  Add a little extra debugging information.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Acked-By: Russ Meyerriecks <rmeyerriecks at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9534

Modified:
    linux/branches/2.4/drivers/dahdi/voicebus/voicebus.c

Modified: linux/branches/2.4/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=9684&r1=9683&r2=9684
==============================================================================
--- linux/branches/2.4/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/branches/2.4/drivers/dahdi/voicebus/voicebus.c Thu Jan 20 23:31:43 2011
@@ -678,8 +678,13 @@
 	} while ((reg & 0x00000001) && time_before(jiffies, timeout));
 
 	if (reg & 0x00000001) {
-		dev_warn(&vb->pdev->dev, "Did not come out of reset "
-			 "within 100ms\n");
+		if (-1 == reg) {
+			dev_err(&vb->pdev->dev,
+				"Unable to read I/O registers.\n");
+		} else {
+			dev_err(&vb->pdev->dev, "Did not come out of reset "
+				"within 100ms\n");
+		}
 		return -EIO;
 	}