summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/onenand/onenand_base.c7
-rw-r--r--drivers/mtd/onenand/samsung.c4
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 531ccbcdc04b..e886d7af868f 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -3994,11 +3994,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
3994 /* Allocate buffers, if necessary */ 3994 /* Allocate buffers, if necessary */
3995 if (!this->page_buf) { 3995 if (!this->page_buf) {
3996 this->page_buf = kzalloc(mtd->writesize, GFP_KERNEL); 3996 this->page_buf = kzalloc(mtd->writesize, GFP_KERNEL);
3997 if (!this->page_buf) { 3997 if (!this->page_buf)
3998 printk(KERN_ERR "%s: Can't allocate page_buf\n",
3999 __func__);
4000 return -ENOMEM; 3998 return -ENOMEM;
4001 }
4002#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE 3999#ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
4003 this->verify_buf = kzalloc(mtd->writesize, GFP_KERNEL); 4000 this->verify_buf = kzalloc(mtd->writesize, GFP_KERNEL);
4004 if (!this->verify_buf) { 4001 if (!this->verify_buf) {
@@ -4011,8 +4008,6 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
4011 if (!this->oob_buf) { 4008 if (!this->oob_buf) {
4012 this->oob_buf = kzalloc(mtd->oobsize, GFP_KERNEL); 4009 this->oob_buf = kzalloc(mtd->oobsize, GFP_KERNEL);
4013 if (!this->oob_buf) { 4010 if (!this->oob_buf) {
4014 printk(KERN_ERR "%s: Can't allocate oob_buf\n",
4015 __func__);
4016 if (this->options & ONENAND_PAGEBUF_ALLOC) { 4011 if (this->options & ONENAND_PAGEBUF_ALLOC) {
4017 this->options &= ~ONENAND_PAGEBUF_ALLOC; 4012 this->options &= ~ONENAND_PAGEBUF_ALLOC;
4018 kfree(this->page_buf); 4013 kfree(this->page_buf);
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index df7400dd4df8..b1a792fd1c23 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -872,10 +872,8 @@ static int s3c_onenand_probe(struct platform_device *pdev)
872 872
873 size = sizeof(struct mtd_info) + sizeof(struct onenand_chip); 873 size = sizeof(struct mtd_info) + sizeof(struct onenand_chip);
874 mtd = kzalloc(size, GFP_KERNEL); 874 mtd = kzalloc(size, GFP_KERNEL);
875 if (!mtd) { 875 if (!mtd)
876 dev_err(&pdev->dev, "failed to allocate memory\n");
877 return -ENOMEM; 876 return -ENOMEM;
878 }
879 877
880 onenand = kzalloc(sizeof(struct s3c_onenand), GFP_KERNEL); 878 onenand = kzalloc(sizeof(struct s3c_onenand), GFP_KERNEL);
881 if (!onenand) { 879 if (!onenand) {