From 0ef722763ce32aced4879ab2d16079d37721e328 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 3 Nov 2012 10:58:36 +0000 Subject: [PATCH] --- yaml --- r: 356305 b: refs/heads/master c: 93c3e913e104c9277e32a0d7e03f268d146c57ee h: refs/heads/master i: 356303: a83c898401f113f0d909366f3ca82a79c04e2ba9 v: v3 --- [refs] | 2 +- trunk/drivers/parisc/pdc_stable.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 515016dbd60d..3e15502b4df6 100644 --- 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 index 246a92f677e4..0f54ab6260df 100644 --- 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;