[svn-commits] kmoore: linux/trunk r9050 - /linux/trunk/drivers/dahdi/wctdm24xxp/base.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Jul 29 16:51:50 2010
New Revision: 9050

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9050
Log:
wctdm24xxp: don't report about VPM100s if none are present and warn the user when flashing firmware

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

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9050&r1=9049&r2=9050
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Jul 29 16:51:50 2010
@@ -3762,7 +3762,9 @@
 		if (debug & DEBUG_ECHOCAN)
 			dev_info(&wc->vb.pdev->dev, "VPM100: Chip %d: ver %02x\n", x, ver);
 		if (ver != 0x33) {
-			dev_info(&wc->vb.pdev->dev, "VPM100: %s\n", x ? "Inoperable" : "Not Present");
+			if (x)
+				dev_info(&wc->vb.pdev->dev,
+						"VPM100: Inoperable\n");
 			wc->vpm100 = 0;
 			return -ENODEV;
 		}	
@@ -4466,6 +4468,9 @@
 	u8 status;
 	int ret = 0;
 	const int HYBRID_PAGE_COUNT = (sizeof(ha8_fw->data)) / HYBRID_PAGE_SIZE;
+
+	dev_info(&wc->vb.pdev->dev, "Reloading firmware. Do not power down "
+			"the system until the process is complete.\n");
 
 	BUG_ON(!ha8_fw);
 	might_sleep();