Message ID | 57946.192.168.10.89.1246035773.squirrel@dbdmail.itg.ti.com |
---|---|
State | New, archived |
Headers | show |
On Fri, 2009-06-26 at 22:32 +0530, vimal singh wrote: > Somehow I do not see below errors on compilation: > drivers/mtd/nand/omap2.c: In function 'omap_wait': > drivers/mtd/nand/omap2.c:543: error: 'jiffies' undeclared (first use in this > function) > drivers/mtd/nand/omap2.c:543: error: (Each undeclared identifier is reported > only once > drivers/mtd/nand/omap2.c:543: error: for each function it appears in.) > drivers/mtd/nand/omap2.c:557: error: implicit declaration of function > 'time_before' > > But still including 'linux/jiffies.h'. > > Below is the patch. The 'status' you return in the case that you _have_ gone through the loop is still wrong though, isn't it?
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 0cd76f8..3b6e6ad 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -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)