1 From 909840ef844013379e5ec399c1e76c65d1a6eb1d Mon Sep 17 00:00:00 2001
2 From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
3 Date: Sat, 12 Oct 2013 21:09:47 +0200
4 Subject: sf: fix out-of-order calls for spi_claim_bus and spi_release_bus
6 Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
8 diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
9 index 108665f..d34747b 100644
10 --- a/drivers/mtd/spi/sf_ops.c
11 +++ b/drivers/mtd/spi/sf_ops.c
12 @@ -132,12 +132,6 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
14 timeout = SPI_FLASH_PAGE_ERASE_TIMEOUT;
16 - ret = spi_claim_bus(flash->spi);
18 - debug("SF: unable to claim SPI bus\n");
22 ret = spi_flash_cmd_write_enable(flash);
24 debug("SF: enabling write failed\n");
25 @@ -158,8 +152,6 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
29 - spi_release_bus(spi);
34 @@ -175,12 +167,18 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
38 + ret = spi_claim_bus(flash->spi);
40 + debug("SF: unable to claim SPI bus\n");
44 cmd[0] = flash->erase_cmd;
46 #ifdef CONFIG_SPI_FLASH_BAR
47 ret = spi_flash_bank(flash, offset);
52 spi_flash_addr(offset, cmd);
54 @@ -190,13 +188,16 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
55 ret = spi_flash_write_common(flash, cmd, sizeof(cmd), NULL, 0);
57 debug("SF: erase failed\n");
67 + spi_release_bus(flash->spi);
72 @@ -208,6 +209,12 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
76 + ret = spi_claim_bus(flash->spi);
78 + debug("SF: unable to claim SPI bus\n");
82 page_size = flash->page_size;
84 cmd[0] = CMD_PAGE_PROGRAM;
85 @@ -215,7 +222,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
86 #ifdef CONFIG_SPI_FLASH_BAR
87 ret = spi_flash_bank(flash, offset);
92 byte_addr = offset % page_size;
93 chunk_len = min(len - actual, page_size - byte_addr);
94 @@ -232,12 +239,15 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
95 buf + actual, chunk_len);
97 debug("SF: write failed\n");
106 + spi_release_bus(flash->spi);
111 @@ -247,20 +257,12 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
112 struct spi_slave *spi = flash->spi;
115 - ret = spi_claim_bus(flash->spi);
117 - debug("SF: unable to claim SPI bus\n");
121 ret = spi_flash_cmd_read(spi, cmd, cmd_len, data, data_len);
123 debug("SF: read cmd failed\n");
127 - spi_release_bus(spi);
132 @@ -271,6 +273,12 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
133 u32 remain_len, read_len;
136 + ret = spi_claim_bus(flash->spi);
138 + debug("SF: unable to claim SPI bus\n");
142 /* Handle memory-mapped SPI */
143 if (flash->memory_map) {
144 spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP);
145 @@ -289,7 +297,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
146 ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
148 debug("SF: fail to set bank%d\n", bank_sel);
153 remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset;
154 @@ -304,7 +312,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
157 debug("SF: read failed\n");
163 @@ -312,6 +320,9 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
168 + spi_release_bus(flash->spi);