From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbcJADM6 (ORCPT ); Fri, 30 Sep 2016 23:12:58 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:51397 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750984AbcJADM5 (ORCPT ); Fri, 30 Sep 2016 23:12:57 -0400 From: Guenter Roeck To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Andrew Duggan Subject: [PATCH] Input: synaptics-rmi4 - Fix error handling in SPI transport driver Date: Fri, 30 Sep 2016 20:12:53 -0700 Message-Id: <1475291573-20393-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.5.0 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instantiating the rmi4 SPI transport driver without an interrupt assigned caused the driver to fail to load, but it does not clean up its transport device registration. Result may be a crash at a later time, for example when rebooting the system. Fixes: 8d99758dee31 ("Input: synaptics-rmi4 - add SPI transport driver") Cc: Andrew Duggan Signed-off-by: Guenter Roeck --- drivers/input/rmi4/rmi_spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c index 55bd1b34970c..f8484b7cdead 100644 --- a/drivers/input/rmi4/rmi_spi.c +++ b/drivers/input/rmi4/rmi_spi.c @@ -466,8 +466,10 @@ static int rmi_spi_probe(struct spi_device *spi) } retval = rmi_spi_init_irq(spi); - if (retval < 0) + if (retval < 0) { + rmi_unregister_transport_device(&rmi_spi->xport); return retval; + } dev_info(&spi->dev, "registered RMI SPI driver\n"); return 0; -- 2.5.0