projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-2.6-microblaze.git]
/
drivers
/
mtd
/
devices
/
st_spi_fsm.c
diff --git
a/drivers/mtd/devices/st_spi_fsm.c
b/drivers/mtd/devices/st_spi_fsm.c
index
1888523
..
983999c
100644
(file)
--- a/
drivers/mtd/devices/st_spi_fsm.c
+++ b/
drivers/mtd/devices/st_spi_fsm.c
@@
-924,7
+924,7
@@
static int stfsm_read_status(struct stfsm *fsm, uint8_t cmd,
BUG_ON(bytes != 1 && bytes != 2);
seq->seq_opc[0] = (SEQ_OPC_PADS_1 | SEQ_OPC_CYCLES(8) |
- SEQ_OPC_OPCODE(cmd))
,
+ SEQ_OPC_OPCODE(cmd))
;
stfsm_load_seq(fsm, seq);