diff options
Diffstat (limited to 'meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0020-mtd-m25p80-make-command-buffer-DMA-safe.patch')
| -rw-r--r-- | meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0020-mtd-m25p80-make-command-buffer-DMA-safe.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0020-mtd-m25p80-make-command-buffer-DMA-safe.patch b/meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0020-mtd-m25p80-make-command-buffer-DMA-safe.patch deleted file mode 100644 index d5be404..0000000 --- a/meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0020-mtd-m25p80-make-command-buffer-DMA-safe.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ca811c5491b0447d917148156785330af2ec9abe Mon Sep 17 00:00:00 2001 -From: Johannes Stezenbach <js@sig21.net> -Date: Wed, 28 Oct 2009 14:21:37 +0100 -Subject: [PATCH 20/27] mtd: m25p80: make command buffer DMA-safe - -spi_write() requires the buffer to be DMA-safe, kmalloc() -it seperately to ensure this. - -Signed-off-by: Johannes Stezenbach <js@sig21.net> -Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> -Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> -(cherry picked from commit 61c3506c2cabe58bcdfe438d1e57b62994db1616) ---- - drivers/mtd/devices/m25p80.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c -index f6b255c..7ca5ab1 100644 ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -84,7 +84,7 @@ struct m25p { - struct mtd_info mtd; - unsigned partitioned:1; - u8 erase_opcode; -- u8 command[CMD_SIZE + FAST_READ_DUMMY_BYTE]; -+ u8 *command; - }; - - static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd) -@@ -762,6 +762,11 @@ static int __devinit m25p_probe(struct spi_device *spi) - flash = kzalloc(sizeof *flash, GFP_KERNEL); - if (!flash) - return -ENOMEM; -+ flash->command = kmalloc(CMD_SIZE + FAST_READ_DUMMY_BYTE, GFP_KERNEL); -+ if (!flash->command) { -+ kfree(flash); -+ return -ENOMEM; -+ } - - flash->spi = spi; - mutex_init(&flash->lock); -@@ -877,8 +882,10 @@ static int __devexit m25p_remove(struct spi_device *spi) - status = del_mtd_partitions(&flash->mtd); - else - status = del_mtd_device(&flash->mtd); -- if (status == 0) -+ if (status == 0) { -+ kfree(flash->command); - kfree(flash); -+ } - return 0; - } - --- -1.8.1 - |
