git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mtd/chips: add missing set_current_state() to cfi_{amdstd,staa}_sync()
[pandora-kernel.git]
/
drivers
/
mtd
/
chips
/
cfi_cmdset_0020.c
diff --git
a/drivers/mtd/chips/cfi_cmdset_0020.c
b/drivers/mtd/chips/cfi_cmdset_0020.c
index
d56849f
..
492e2ab
100644
(file)
--- a/
drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/
drivers/mtd/chips/cfi_cmdset_0020.c
@@
-158,6
+158,8
@@
struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary)
cfi->chips[i].word_write_time = 128;
cfi->chips[i].buffer_write_time = 128;
cfi->chips[i].erase_time = 1024;
cfi->chips[i].word_write_time = 128;
cfi->chips[i].buffer_write_time = 128;
cfi->chips[i].erase_time = 1024;
+ cfi->chips[i].ref_point_counter = 0;
+ init_waitqueue_head(&(cfi->chips[i].wq));
}
return cfi_staa_setup(map);
}
return cfi_staa_setup(map);
@@
-662,7
+664,7
@@
static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to,
* a small buffer for this.
* XXX: If the buffer size is not a multiple of 2, this will break
*/
* a small buffer for this.
* XXX: If the buffer size is not a multiple of 2, this will break
*/
-#define ECCBUF_SIZE (mtd->
ecc
size)
+#define ECCBUF_SIZE (mtd->
write
size)
#define ECCBUF_DIV(x) ((x) & ~(ECCBUF_SIZE - 1))
#define ECCBUF_MOD(x) ((x) & (ECCBUF_SIZE - 1))
static int
#define ECCBUF_DIV(x) ((x) & ~(ECCBUF_SIZE - 1))
#define ECCBUF_MOD(x) ((x) & (ECCBUF_SIZE - 1))
static int
@@
-1013,6
+1015,7
@@
static void cfi_staa_sync (struct mtd_info *mtd)
default:
/* Not an idle state */
default:
/* Not an idle state */
+ set_current_state(TASK_UNINTERRUPTIBLE);
add_wait_queue(&chip->wq, &wait);
spin_unlock_bh(chip->mutex);
add_wait_queue(&chip->wq, &wait);
spin_unlock_bh(chip->mutex);