The patch titled spi_s3c24xx: fix transfer setup code has been added to the -mm tree. Its filename is spi_s3c24xx-fix-transfer-setup-code.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: spi_s3c24xx: fix transfer setup code From: Ben Dooks <ben@xxxxxxxxxxxx> Since the changes to the bitbang driver, there is the possibility we will be called with either the speed_hz or bpw values zero. We take these to mean that the default values (8 bits per word, or maximum bus speed). Signed-off-by: Ben Dooks <ben@xxxxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi_s3c24xx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN drivers/spi/spi_s3c24xx.c~spi_s3c24xx-fix-transfer-setup-code drivers/spi/spi_s3c24xx.c --- a/drivers/spi/spi_s3c24xx.c~spi_s3c24xx-fix-transfer-setup-code +++ a/drivers/spi/spi_s3c24xx.c @@ -116,6 +116,12 @@ static int s3c24xx_spi_setupxfer(struct bpw = t ? t->bits_per_word : spi->bits_per_word; hz = t ? t->speed_hz : spi->max_speed_hz; + if (!bpw) + bpw = 8; + + if (!hz) + hz = spi->max_speed_hz; + if (bpw != 8) { dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw); return -EINVAL; _ Patches currently in -mm which might be from ben@xxxxxxxxxxxx are linux-next.patch spi-fix-spelling-of-automatically-in-documentation.patch spi_s3c24xx-fix-clock-rate-calculation.patch spi_s3c24xx-fix-transfer-setup-code.patch spi_s3c24xx-fix-header-includes.patch spi_s3c24xx-use-resource_size-to-get-resource-size.patch spi_s3c24xx-use-dev_pm_ops.patch spi_s3c24xx-cache-device-setup-data.patch gpiolib-add-names-file-in-gpio-chip-sysfs.patch gpiolib-add-names-file-in-gpio-chip-sysfs-checkpatch-fixes.patch gpiolib-add-names-file-in-gpio-chip-sysfs-checkpatch-fixes-fix.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