Skip to contentSkip to conversation

spi: checking for NULL instead of IS_ERR

PATCH In review Dan Carpenter 2 participants 2 messages Feb 12, 2016

Subsystems (2)
Kernel janitors SPI
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 spi: checking for NULL instead of IS_ERR

spi_replace_transfers() returns error pointers on error, it never returns NULL.

Fixes d9f121227281 ('spi: core: add spi_split_transfers_maxsize')
Signed-off-by Dan Carpenter <[email protected]>
drivers/spi/spi.c +2 -2
index 1413a6b..d459adc 100644
@@ -2284,8 +2284,8 @@ int __spi_split_transfer_maxsize(struct spi_master *master,
 
 	/* create replacement */
 	srt = spi_replace_transfers(msg, xfer, 1, count, NULL, 0, gfp);
-	if (!srt)
-		return -ENOMEM;
+	if (IS_ERR(srt))
+		return PTR_ERR(srt);
 	xfers = srt->inserted_transfers;
 
 	/* now handle each of those newly inserted spi_transfers
#1 lore raw

Applied "spi: checking for NULL instead of IS_ERR" to the spi tree

The patch

spi: checking for NULL instead of IS_ERR

has been applied to the spi tree at

git://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

Quoted 1 line

From 657d32efe04197736ed328a34ba659b5172c8cce Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Fri, 12 Feb 2016 09:38:33 +0300
Subject: [PATCH] spi: checking for NULL instead of IS_ERR

spi_replace_transfers() returns error pointers on error, it never returns NULL.

Fixes d9f121227281 ('spi: core: add spi_split_transfers_maxsize')
Signed-off-by Dan Carpenter <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 drivers/spi/spi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi.c +2 -2
index 34e3741504f9..801e8900898b 100644
@@ -2262,8 +2262,8 @@ int __spi_split_transfer_maxsize(struct spi_master *master,
 
 	/* create replacement */
 	srt = spi_replace_transfers(msg, xfer, 1, count, NULL, 0, gfp);
-	if (!srt)
-		return -ENOMEM;
+	if (IS_ERR(srt))
+		return PTR_ERR(srt);
 	xfers = srt->inserted_transfers;
 
 	/* now handle each of those newly inserted spi_transfers
Signature · 6 lines
2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html