Commit 3c409b15 authored by Russell King's avatar Russell King

[ARM] Fix more timeouts to use correct type.

parent c7416967
...@@ -354,6 +354,7 @@ static int erase_block(int nBlock) ...@@ -354,6 +354,7 @@ static int erase_block(int nBlock)
{ {
volatile unsigned int c1; volatile unsigned int c1;
volatile unsigned char *pWritePtr; volatile unsigned char *pWritePtr;
unsigned long timeout;
int temp, temp1; int temp, temp1;
/* /*
...@@ -406,9 +407,9 @@ static int erase_block(int nBlock) ...@@ -406,9 +407,9 @@ static int erase_block(int nBlock)
/* /*
* wait while erasing in process (up to 10 sec) * wait while erasing in process (up to 10 sec)
*/ */
temp = jiffies + 10 * HZ; timeout = jiffies + 10 * HZ;
c1 = 0; c1 = 0;
while (!(c1 & 0x80) && time_before(jiffies, temp)) { while (!(c1 & 0x80) && time_before(jiffies, timeout)) {
flash_wait(HZ / 100); flash_wait(HZ / 100);
/* /*
* read any address * read any address
...@@ -466,8 +467,8 @@ static int write_block(unsigned long p, const char *buf, int count) ...@@ -466,8 +467,8 @@ static int write_block(unsigned long p, const char *buf, int count)
unsigned char *pWritePtr; unsigned char *pWritePtr;
unsigned int uAddress; unsigned int uAddress;
unsigned int offset; unsigned int offset;
unsigned int timeout; unsigned long timeout;
unsigned int timeout1; unsigned long timeout1;
/* /*
* red LED == write * red LED == write
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment