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 --- a/drivers/mtd/spi/sf_ops.c
9 +++ b/drivers/mtd/spi/sf_ops.c
10 @@ -132,12 +132,6 @@ int spi_flash_write_common(struct spi_fl
12 timeout = SPI_FLASH_PAGE_ERASE_TIMEOUT;
14 - ret = spi_claim_bus(flash->spi);
16 - debug("SF: unable to claim SPI bus\n");
20 ret = spi_flash_cmd_write_enable(flash);
22 debug("SF: enabling write failed\n");
23 @@ -158,8 +152,6 @@ int spi_flash_write_common(struct spi_fl
27 - spi_release_bus(spi);
32 @@ -175,12 +167,18 @@ int spi_flash_cmd_erase_ops(struct spi_f
36 + ret = spi_claim_bus(flash->spi);
38 + debug("SF: unable to claim SPI bus\n");
42 cmd[0] = flash->erase_cmd;
44 #ifdef CONFIG_SPI_FLASH_BAR
45 ret = spi_flash_bank(flash, offset);
50 spi_flash_addr(offset, cmd);
52 @@ -190,13 +188,16 @@ int spi_flash_cmd_erase_ops(struct spi_f
53 ret = spi_flash_write_common(flash, cmd, sizeof(cmd), NULL, 0);
55 debug("SF: erase failed\n");
65 + spi_release_bus(flash->spi);
70 @@ -208,6 +209,12 @@ int spi_flash_cmd_write_ops(struct spi_f
74 + ret = spi_claim_bus(flash->spi);
76 + debug("SF: unable to claim SPI bus\n");
80 page_size = flash->page_size;
82 cmd[0] = CMD_PAGE_PROGRAM;
83 @@ -215,7 +222,7 @@ int spi_flash_cmd_write_ops(struct spi_f
84 #ifdef CONFIG_SPI_FLASH_BAR
85 ret = spi_flash_bank(flash, offset);
90 byte_addr = offset % page_size;
91 chunk_len = min(len - actual, page_size - byte_addr);
92 @@ -232,12 +239,15 @@ int spi_flash_cmd_write_ops(struct spi_f
93 buf + actual, chunk_len);
95 debug("SF: write failed\n");
104 + spi_release_bus(flash->spi);
109 @@ -247,20 +257,12 @@ int spi_flash_read_common(struct spi_fla
110 struct spi_slave *spi = flash->spi;
113 - ret = spi_claim_bus(flash->spi);
115 - debug("SF: unable to claim SPI bus\n");
119 ret = spi_flash_cmd_read(spi, cmd, cmd_len, data, data_len);
121 debug("SF: read cmd failed\n");
125 - spi_release_bus(spi);
130 @@ -271,6 +273,12 @@ int spi_flash_cmd_read_ops(struct spi_fl
131 u32 remain_len, read_len;
134 + ret = spi_claim_bus(flash->spi);
136 + debug("SF: unable to claim SPI bus\n");
140 /* Handle memory-mapped SPI */
141 if (flash->memory_map) {
142 spi_xfer(flash->spi, 0, NULL, NULL, SPI_XFER_MMAP);
143 @@ -289,7 +297,7 @@ int spi_flash_cmd_read_ops(struct spi_fl
144 ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
146 debug("SF: fail to set bank%d\n", bank_sel);
151 remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset;
152 @@ -304,7 +312,7 @@ int spi_flash_cmd_read_ops(struct spi_fl
155 debug("SF: read failed\n");
161 @@ -312,6 +320,9 @@ int spi_flash_cmd_read_ops(struct spi_fl
166 + spi_release_bus(flash->spi);