From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755103AbdBGTlK (ORCPT ); Tue, 7 Feb 2017 14:41:10 -0500 Received: from mout.web.de ([217.72.192.78]:52106 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdBGTlA (ORCPT ); Tue, 7 Feb 2017 14:41:00 -0500 Subject: [PATCH 02/18] HID: Delete an error message for a failed memory allocation in open_collection() To: linux-input@vger.kernel.org, Benjamin Tissoires , =?UTF-8?Q?Bruno_Pr=c3=a9mont?= , Jiri Kosina References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Tue, 7 Feb 2017 20:40:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:iNNwB0g4ri7Kx+nc6QoJg94Z1qXlh2mLSo2Yid3LGUbkB5kif7W /arP16hIr0ehedgbQYX70StR96MvqWW/iGbuwUWc0M/o0+3hotHehDkZ9eUXQmsGSnVEmsG 4OLixsK63PeCJku2N2BvXiWKbSQKrjK56vb6kt7lJA6GGg97jsxyjokVr7J3to48er8d4Vf kOiRyJpBt7RnhRirIb9Cg== X-UI-Out-Filterresults: notjunk:1;V01:K0:ZS4Hd9MzB3I=:h3ueR+i0xtUcuWvKTh7ETm i/3Vperv8OxDU6Jbwsqx9xkoGUMdcxgv1/LTfG/fRqWcTnOgpGrPkjmO6eyOynfPsyR2lamBP H1I6VGSxrsWgJ2U3D4yCwOel3BvlJdlzwdbHctBL4+pBb/5usm6hXkv95jK4sj6BV8SMYnRBy U8o5dlY2sd0ds1O54P0kvtmyKxDhxpFI71raZ8J+DPuH+4EYdpDa6FfjcS0w01gTL0GD8WPy1 DplgU/5PwhYu91khYRBJ9kT4eDgknwJzgerQkEXQIt4eIdfywMrTksVA/2639OYrf8qeqR7lD xtkhmQ/8NrKw7pVmOHCJ4X2UTAcA2rj5YcVHt6PCJ1dorqwbyTpB3dvLjwjC/hT4onlaz3QgA ySF0RG5ISLXcPGbr7tF8u0hpUqZdX7/KKnfQbWkNcwqsMW5LnKGHAmUI9lM+HydeepXUSLaRU Dzpz7dVlEhK0RGHuN8mtRtMJgW7jKaQPmuyVkhJpHYSficqYWd2LaVNRxytZ8P8bkBOSi4Cjl R2qICSQkF7jZogcZtjVj2tY2sxvbzr1y+ZFytiCrJWtmBzoxMsbYiVebD6bjIHgIpH7pAJMVi SqMADIh3M2hTc2A39+qa5ZpQXOvvcBID/13LEy6GBZIe70EdZapVBBETqGndEILgjifJWT0Q2 8CDW1M0KtcbG1pJmpzVIshzo8ydmmm6LG1F5T8tE/Og3DuFL3FXcSjMwIcC3HkM/ObRBkCYzJ 5/OSoAQIfuoVLSOGPinzp3a0U1133OsdDlqES9GUHpxPaFxCszkIO+wais5aXr72Uis0/WCvW 4wCZ5ya Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 6 Feb 2017 18:42:26 +0100 The script "checkpatch.pl" pointed information out like the following. WARNING: Possible unnecessary 'out of memory' message Thus fix the affected source code place. Signed-off-by: Markus Elfring --- drivers/hid/hid-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 9b0a97bbde96..ffb7e5d4ee19 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -133,10 +133,9 @@ static int open_collection(struct hid_parser *parser, unsigned type) if (parser->device->maxcollection == parser->device->collection_size) { collection = kmalloc(sizeof(struct hid_collection) * parser->device->collection_size * 2, GFP_KERNEL); - if (collection == NULL) { - hid_err(parser->device, "failed to reallocate collection array\n"); + if (!collection) return -ENOMEM; - } + memcpy(collection, parser->device->collection, sizeof(struct hid_collection) * parser->device->collection_size); -- 2.11.1