Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c276aca4 authored by vimal singh's avatar vimal singh Committed by David Woodhouse
Browse files

mtd: nand: fix build failure and incorrect return from omap_wait() 



We need to include jiffies.h manually in some cases, and the status
returned from omap_wait() was broken in two separate ways.

Also add cond_resched() to the loop.

Signed-off-by: default avatarVimal Singh <vimalsingh@ti.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 70ec3bb8

drivers/mtd/nand/omap2.c

+5 −2
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>

#include <linux/jiffies.h>

#include <linux/sched.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>
@@ -541,7 +543,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) 
	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,

							mtd);

	unsigned long timeo = jiffies;

	int status, state = this->state;

	int status = NAND_STATUS_FAIL, state = this->state;



	if (state == FL_ERASING)

		timeo += (HZ * 400) / 1000;
@@ -556,8 +558,9 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip) 


	while (time_before(jiffies, timeo)) {

		status = __raw_readb(this->IO_ADDR_R);

		if (!(status & 0x40))

		if (status & NAND_STATUS_READY)

			break;

		cond_resched();

	}

	return status;

}