From 91407412f47a1152046efa486e09618c1be7bcad Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Wed, 11 Nov 2009 21:47:06 +0100
Subject: [PATCH] --- yaml --- r: 176945 b: refs/heads/master c:
 895fb49459227edbb4a4e5a2b5e9d12c34640f84 h: refs/heads/master i:   176943:
 8c068bf6296c7f2f074faf0ef095a0dfd16a61ee v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mtd/maps/physmap.c    | 2 +-
 trunk/drivers/mtd/maps/vmu-flash.c  | 2 +-
 trunk/drivers/mtd/nand/atmel_nand.c | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 281babfc94bf..52d9e7b41ce0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2ef1a2bb2eb49cd7c75b22f1ea40ead0bdfdb8a
+refs/heads/master: 895fb49459227edbb4a4e5a2b5e9d12c34640f84
diff --git a/trunk/drivers/mtd/maps/physmap.c b/trunk/drivers/mtd/maps/physmap.c
index 3f13a9673e7f..d9603f7f9652 100644
--- a/trunk/drivers/mtd/maps/physmap.c
+++ b/trunk/drivers/mtd/maps/physmap.c
@@ -129,7 +129,7 @@ static int physmap_flash_probe(struct platform_device *dev)
 						 info->map[i].size);
 		if (info->map[i].virt == NULL) {
 			dev_err(&dev->dev, "Failed to ioremap flash region\n");
-			err = EIO;
+			err = -EIO;
 			goto err_out;
 		}
 
diff --git a/trunk/drivers/mtd/maps/vmu-flash.c b/trunk/drivers/mtd/maps/vmu-flash.c
index 1008462c3f7c..82afad0ddd72 100644
--- a/trunk/drivers/mtd/maps/vmu-flash.c
+++ b/trunk/drivers/mtd/maps/vmu-flash.c
@@ -620,7 +620,7 @@ static int __devinit vmu_connect(struct maple_device *mdev)
 
 	card = kmalloc(sizeof(struct memcard), GFP_KERNEL);
 	if (!card) {
-		error = ENOMEM;
+		error = -ENOMEM;
 		goto fail_nomem;
 	}
 
diff --git a/trunk/drivers/mtd/nand/atmel_nand.c b/trunk/drivers/mtd/nand/atmel_nand.c
index 4f62d207b87b..524e6c9e0672 100644
--- a/trunk/drivers/mtd/nand/atmel_nand.c
+++ b/trunk/drivers/mtd/nand/atmel_nand.c
@@ -463,7 +463,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 	if (host->board->det_pin) {
 		if (gpio_get_value(host->board->det_pin)) {
 			printk(KERN_INFO "No SmartMedia card inserted.\n");
-			res = ENXIO;
+			res = -ENXIO;
 			goto err_no_card;
 		}
 	}
@@ -534,7 +534,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
 	if ((!partitions) || (num_partitions == 0)) {
 		printk(KERN_ERR "atmel_nand: No partitions defined, or unsupported device.\n");
-		res = ENXIO;
+		res = -ENXIO;
 		goto err_no_partitions;
 	}