---

yaml --- r: 356305 b: refs/heads/master c: 93c3e91 h: refs/heads/master i: 356303: a83c898 v: v3
git-mirror · Feb 20, 2013 · 0ef7227 · 0ef7227
1 parent 080cabf
commit 0ef7227
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fad9b8d597f3a901fde947fc531886f685652c7
+refs/heads/master: 93c3e913e104c9277e32a0d7e03f268d146c57ee
diff --git a/trunk/drivers/parisc/pdc_stable.c b/trunk/drivers/parisc/pdc_stable.c
@@ -212,12 +212,10 @@ pdcspath_store(struct pdcspath_entry *entry)
 			entry, devpath, entry->addr);
 
 	/* addr, devpath and count must be word aligned */
-	if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK) {
-		printk(KERN_ERR "%s: an error occurred when writing to PDC.\n"
+	if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK)
+		WARN(1, KERN_ERR "%s: an error occurred when writing to PDC.\n"
 				"It is likely that the Stable Storage data has been corrupted.\n"
 				"Please check it carefully upon next reboot.\n", __func__);
-		WARN_ON(1);
-	}
 
 	/* kobject is already registered */
 	entry->ready = 2;