linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Clark Wang <xiaoning.wang@nxp.com>
Cc: Fugang Duan <Fugang.duan@nxp.com>,
	Mark Brown <broonie@kernel.org>,
	"broonie@kernel.org" <broonie@kernel.org>,
	"linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	linux-spi@vger.kernel.org
Subject: Applied "spi: lpspi: Add the missing NULL check" to the spi tree
Date: Mon, 18 Mar 2019 14:52:07 +0000 (GMT)	[thread overview]
Message-ID: <20190318145207.DD4F81128874@debutante.sirena.org.uk> (raw)
In-Reply-To: <20190306063020.793-8-xiaoning.wang@nxp.com>

The patch

   spi: lpspi: Add the missing NULL check

has been applied to the spi tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 578465ea2b4b56368ddc3dcefb1f6d607382ef86 Mon Sep 17 00:00:00 2001
From: Clark Wang <xiaoning.wang@nxp.com>
Date: Wed, 6 Mar 2019 06:30:47 +0000
Subject: [PATCH] spi: lpspi: Add the missing NULL check

The spi_transfer *t will be used in one transfer whatever. If t is NULL,
there has no need to try sending data, so add an error return here.

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Acked-by: Fugang Duan <Fugang.duan@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-fsl-lpspi.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
index 9ff32fb67a29..2ac3ac5ea50a 100644
--- a/drivers/spi/spi-fsl-lpspi.c
+++ b/drivers/spi/spi-fsl-lpspi.c
@@ -438,9 +438,12 @@ static int fsl_lpspi_setup_transfer(struct spi_controller *controller,
 	struct fsl_lpspi_data *fsl_lpspi =
 				spi_controller_get_devdata(spi->controller);
 
+	if (t == NULL)
+		return -EINVAL;
+
 	fsl_lpspi->config.mode = spi->mode;
-	fsl_lpspi->config.bpw = t ? t->bits_per_word : spi->bits_per_word;
-	fsl_lpspi->config.speed_hz = t ? t->speed_hz : spi->max_speed_hz;
+	fsl_lpspi->config.bpw = t->bits_per_word;
+	fsl_lpspi->config.speed_hz = t->speed_hz;
 	fsl_lpspi->config.chip_select = spi->chip_select;
 
 	if (!fsl_lpspi->config.speed_hz)
-- 
2.20.1


  reply	other threads:[~2019-03-18 14:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-06  6:30 [PATCH V2 0/8] spi: lpspi: Fix bugs and Add some functions support Clark Wang
2019-03-06  6:30 ` [PATCH V2 1/8] spi: lpspi: Add i.MX8 boards support for lpspi Clark Wang
2019-03-06  6:30 ` [PATCH V2 2/8] doc: lpspi: Document DT bindings for LPSPI clocks Clark Wang
2019-03-18 14:52   ` Applied "doc: lpspi: Document DT bindings for LPSPI clocks" to the spi tree Mark Brown
2019-03-06  6:30 ` [PATCH V2 3/8] spi: lpspi: enable runtime pm for lpspi Clark Wang
2019-03-06  6:30 ` [PATCH V2 4/8] spi: lpspi: add the error info of transfer speed setting Clark Wang
2019-03-06  6:30 ` [PATCH V2 5/8] spi: lpspi: use the core way to implement cs-gpio function Clark Wang
2019-03-18 14:52   ` Applied "spi: lpspi: use the core way to implement cs-gpio function" to the spi tree Mark Brown
2019-03-06  6:30 ` [PATCH V2 6/8] spi: lpspi: add dma mode support Clark Wang
2019-03-18 14:52   ` Applied "spi: lpspi: add dma mode support" to the spi tree Mark Brown
2019-03-06  6:30 ` [PATCH V2 7/8] spi: lpspi: Add the missing NULL check Clark Wang
2019-03-18 14:52   ` Mark Brown [this message]
2019-03-06  6:30 ` [PATCH V2 8/8] spi: lpspi: Code cleanup Clark Wang
2019-03-18 14:52   ` Applied "spi: lpspi: Code cleanup" to the spi tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190318145207.DD4F81128874@debutante.sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=Fugang.duan@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=xiaoning.wang@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).