From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andi Shyti Subject: [PATCH v3 3/3] Input: ad7897 - use separate error handling for different allocators Date: Wed, 8 Nov 2017 17:50:20 +0200 Message-ID: <20171108155020.3851-4-andi@etezian.org> References: <20171108155020.3851-1-andi@etezian.org> Return-path: In-Reply-To: <20171108155020.3851-1-andi@etezian.org> Sender: linux-kernel-owner@vger.kernel.org To: Dmitry Torokhov Cc: Michael Hennerich , Lars-Peter Clausen , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti List-Id: linux-input@vger.kernel.org Split the error between devm_kzalloc and devm_input_allocate_device, there is no need to call the second allocator if the first has failed. Besides this doesn't provide practical advantages. CC: Michael Hennerich Signed-off-by: Andi Shyti --- drivers/input/touchscreen/ad7877.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index 04ab8fbc8184..98deffde3fe2 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -710,8 +710,11 @@ static int ad7877_probe(struct spi_device *spi) } ts = devm_kzalloc(&spi->dev, sizeof(struct ad7877), GFP_KERNEL); + if (!ts) + return -ENOMEM; + input_dev = devm_input_allocate_device(&spi->dev); - if (!ts || !input_dev) + if (!input_dev) return -ENOMEM; err = devm_add_action_or_reset(&spi->dev, ad7877_disable, ts); -- 2.15.0