diff --git a/[refs] b/[refs]
index 67ef014bf9cf..5b9e8d7b3ac7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5289966ea576a062b80319975b31b661c196ff9d
+refs/heads/master: 2c4ae276b13114a2c7ebac31257db391b4bf2b6f
diff --git a/trunk/drivers/mtd/nand/docg4.c b/trunk/drivers/mtd/nand/docg4.c
index baae75b37d7e..9b3a64904668 100644
--- a/trunk/drivers/mtd/nand/docg4.c
+++ b/trunk/drivers/mtd/nand/docg4.c
@@ -1270,9 +1270,7 @@ static int __init probe_docg4(struct platform_device *pdev)
 
 	virtadr = ioremap(r->start, resource_size(r));
 	if (!virtadr) {
-		dev_err(dev, "Diskonchip ioremap failed: "
-			"0x%x bytes at 0x%x\n",
-			resource_size(r), r->start);
+		dev_err(dev, "Diskonchip ioremap failed: %pR\n", r);
 		return -EIO;
 	}