From patchwork Tue Dec 4 15:27:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1838761 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 82C6A3FCA5 for ; Tue, 4 Dec 2012 15:29:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753868Ab2LDP2z (ORCPT ); Tue, 4 Dec 2012 10:28:55 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:50038 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753661Ab2LDP2g (ORCPT ); Tue, 4 Dec 2012 10:28:36 -0500 Received: by mail-wg0-f46.google.com with SMTP id dr13so2395288wgb.1 for ; Tue, 04 Dec 2012 07:28:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=O6fR0S70/A+nA+EkdauqAIknp5O8ICLvbXLMFOaue4M=; b=nUpDMcSN5lzygr9S17ydtGC1tshUfTKjLKvk6R+iW3bf34VYldBbvRkh6DPqvo4kRc xSHVZ/MdfjGEMZ9K+F7P/M3ueXLxeJfaBCEhbD7Lrw9LY7sOpvp22jAFNtUm3Hl0zo4g +2n8jsAaKZsjCCzci4rwPyXdmujSBBygcj0tHypmnbBuDik4Qq9eJ7+TWyAp1CspidZn 8YX4dBvKAQOHQNyJ//XC9TX+U5VqsNa1Y4n8tegIPXznwnzUnbVOmyr5GSb1TTM1d2WO md2QXJBUO0YBtDER5fE+dNQnxnliJcIonJ656RM9eCAxczh5nXTeWKPCAVJSkOE06aLC crHA== Received: by 10.180.93.69 with SMTP id cs5mr5172429wib.3.1354634914973; Tue, 04 Dec 2012 07:28:34 -0800 (PST) Received: from localhost.localdomain.com (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id p3sm15443846wic.8.2012.12.04.07.28.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 04 Dec 2012 07:28:34 -0800 (PST) From: Benjamin Tissoires To: Benjamin Tissoires , Jiri Kosina , Jean Delvare , linux-input@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/14] HID: i2c-hid: also call i2c_hid_free_buffers in i2c_hid_remove Date: Tue, 4 Dec 2012 16:27:54 +0100 Message-Id: <1354634875-5182-14-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1354634875-5182-1-git-send-email-benjamin.tissoires@gmail.com> References: <1354634875-5182-1-git-send-email-benjamin.tissoires@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org In the case where the hid driver in charge of handling the hid part of the device (hid-generic for instance) fails at probe, neither i2c_hid_start nor i2c_hid_stop are called. Thus, the buffers allocated in i2c_hid_probe are never freed. Signed-off-by: Benjamin Tissoires Reviewed-by: Jean Delvare --- drivers/hid/i2c-hid/i2c-hid.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index bea4b13..62988f1 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -891,6 +891,9 @@ static int __devexit i2c_hid_remove(struct i2c_client *client) free_irq(client->irq, ihid); + if (ihid->bufsize) + i2c_hid_free_buffers(ihid); + kfree(ihid); return 0;