[PATCH v3 3/3] Input: ad7897 - use separate error handling for different allocators

From: Andi Shyti
Date: Wed Nov 08 2017 - 10:51:16 EST


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 <michael.hennerich@xxxxxxxxxx>
Signed-off-by: Andi Shyti <andi@xxxxxxxxxxx>
---
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