From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 13 Oct 2007 13:58:23 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.24-rc1~1364^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebf8889bd1fe3615991ff4494635d237280652a2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
---

ebf8889bd1fe3615991ff4494635d237280652a2
diff --cc drivers/mtd/maps/physmap_of.c
index fbd6139,cf75a56..aeed9ea
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@@ -132,15 -225,14 +225,13 @@@ static int __devinit of_flash_probe(str
  		goto err_out;
  	}
  
-        	dev_dbg(&dev->dev, "physmap flash device: %.8llx at %.8llx\n",
- 	    (unsigned long long)res.end - res.start + 1,
- 	    (unsigned long long)res.start);
+        	dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
+ 		(unsigned long long)res.start, (unsigned long long)res.end);
  
- 	info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
- 	if (info == NULL) {
- 		err = -ENOMEM;
+ 	err = -ENOMEM;
+ 	info = kzalloc(sizeof(*info), GFP_KERNEL);
+ 	if (!info)
  		goto err_out;
- 	}
 -	memset(info, 0, sizeof(*info));
  
  	dev_set_drvdata(&dev->dev, info);