From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933882AbdKBPiQ (ORCPT ); Thu, 2 Nov 2017 11:38:16 -0400 Received: from 10.mo68.mail-out.ovh.net ([46.105.79.203]:54924 "EHLO 10.mo68.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933658AbdKBPiP (ORCPT ); Thu, 2 Nov 2017 11:38:15 -0400 From: Andi Shyti To: Dmitry Torokhov Cc: Michael Hennerich , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH 5/5] Input: ad7897 - use separate error handling for different allocators Date: Thu, 2 Nov 2017 17:01:36 +0200 Message-Id: <20171102150136.1476-6-andi@etezian.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171102150136.1476-1-andi@etezian.org> References: <20171102150136.1476-1-andi@etezian.org> X-Ovh-Tracer-Id: 3719128871299367578 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedttddrgeeigdeilecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index c8a143db8681..dc2cb99dc43d 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -708,6 +708,9 @@ 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 (!input_dev) return -ENOMEM; -- 2.15.0