The patch titled Blackfin SPI Driver: use len_in_bytes when we care about the number of bytes transferred has been added to the -mm tree. Its filename is blackfin-spi-driver-use-len_in_bytes-when-we-care-about-the-number-of-bytes-transferred.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Blackfin SPI Driver: use len_in_bytes when we care about the number of bytes transferred From: Mike Frysinger <vapier.adi@xxxxxxxxx> Use len_in_bytes when we care about the number of bytes transferred rather than the number of spi transactions. (this value will be the same for 8bit transfers, but not any other sizes) Signed-off-by: Mike Frysinger <vapier.adi@xxxxxxxxx> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi_bfin5xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/spi/spi_bfin5xx.c~blackfin-spi-driver-use-len_in_bytes-when-we-care-about-the-number-of-bytes-transferred drivers/spi/spi_bfin5xx.c --- a/drivers/spi/spi_bfin5xx.c~blackfin-spi-driver-use-len_in_bytes-when-we-care-about-the-number-of-bytes-transferred +++ a/drivers/spi/spi_bfin5xx.c @@ -804,7 +804,7 @@ static void pump_transfers(unsigned long if (bfin_addr_dcachable((unsigned long) drv_data->rx)) invalidate_dcache_range((unsigned long) drv_data->rx, (unsigned long) (drv_data->rx + - drv_data->len)); + drv_data->len_in_bytes)); /* clear tx reg soformer data is not shifted out */ write_TDBR(drv_data, 0xFFFF); @@ -830,7 +830,7 @@ static void pump_transfers(unsigned long if (bfin_addr_dcachable((unsigned long) drv_data->tx)) flush_dcache_range((unsigned long) drv_data->tx, (unsigned long) (drv_data->tx + - drv_data->len)); + drv_data->len_in_bytes)); /* start dma */ dma_enable_irq(drv_data->dma_channel); @@ -893,7 +893,7 @@ static void pump_transfers(unsigned long message->state = ERROR_STATE; } else { /* Update total byte transfered */ - message->actual_length += drv_data->len; + message->actual_length += drv_data->len_in_bytes; /* Move to next transfer of this msg */ message->state = next_transfer(drv_data); _ Patches currently in -mm which might be from vapier.adi@xxxxxxxxx are video-framebuffer-move-the-probe-func-into-devinittext-in-blackfin-lcd-driver.patch linux-next.patch blackfin-nfc-driver-do-not-clobber-dmac1_perimux.patch blackfin-nfc-driver-mark-bf5xx_nand_add_partition-as-__devinit.patch blackfin-nfc-driver-drop-pointless-casts-with-set_dma_callback.patch mtd-maps-blackfin-async-flash-maps-fix-bug-dont-leak-resources-when-initializing-in-case-of-errors.patch mtd-maps-blackfin-async-flash-maps-bfin-async-mtd-driver-needs-complex-mappings.patch mtd-maps-blackfin-async-flash-maps-fix-up-memory-leak.patch blackfin-spi-driver-ensure-cache-coherency-before-doing-dma.patch blackfin-spi-driver-remove-useless-asm-cplbinith.patch blackfin-spi-driver-use-len_in_bytes-when-we-care-about-the-number-of-bytes-transferred.patch blackfin-spi-driver-pass-dma-overflow-error-to-the-higher-level.patch blackfin-spi-driver-unify-duplicated-code-in-dma-read-write-paths.patch blackfin-spi-driver-drop-bogus-cast-and-touchup-dma-label.patch blackfin-spi-driver-add-a-few-more-dma-debug-messages.patch blackfin-spi-driver-do-not-check-for-spi-errors-if-dma-itself-did-not-flag-any.patch blackfin-spi-driver-use-the-properl-bit_ctl_xxx-defines.patch blackfin-spi-driver-spi-slave-select-code-cleanup.patch blackfin-spi-driver-get-dma-working-for-spi-flashes.patch blackfin-spi-driver-add-timeout-while-waiting-for-spif-in-dma-irq-handler.patch blackfin-spi-driver-tweak-magic-spi-dma-sequence-to-get-it-working-on-bf54x.patch blackfin-spi-driver-use-bfin_spi_-prefix-on-all-functions.patch blackfin-spi-driver-fix-null-pointer-crash.patch blackfin-spi-driver-add-comment-about-full-duplex-dma-according-to-david-brownell.patch bin_elf_fdpic-check-the-return-value-of-clear_user.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html