From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936557AbcIRWWD (ORCPT ); Sun, 18 Sep 2016 18:22:03 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36846 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935665AbcIRWVy (ORCPT ); Sun, 18 Sep 2016 18:21:54 -0400 From: Sudip Mukherjee To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-pcmcia@lists.infradead.org, Sudip Mukherjee Subject: [PATCH 3/3] pcmcia: m32r_pcc: check return from add_pcc_socket Date: Sun, 18 Sep 2016 23:21:44 +0100 Message-Id: <1474237304-897-3-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474237304-897-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1474237304-897-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If request_irq() fails it passes the error to the caller. The caller now checks it and jumps to the common error path on failure. Signed-off-by: Sudip Mukherjee --- drivers/pcmcia/m32r_pcc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index 56bf388..e50bbf8 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c @@ -696,10 +696,16 @@ static int __init init_m32r_pcc(void) pcc_sockets = 0; - add_pcc_socket(M32R_PCC0_BASE, PCC0_IRQ, M32R_PCC0_MAPBASE, 0x1000); + ret = add_pcc_socket(M32R_PCC0_BASE, PCC0_IRQ, M32R_PCC0_MAPBASE, + 0x1000); + if (ret) + goto unreg_dev; #ifdef CONFIG_M32RPCC_SLOT2 - add_pcc_socket(M32R_PCC1_BASE, PCC1_IRQ, M32R_PCC1_MAPBASE, 0x2000); + ret = add_pcc_socket(M32R_PCC1_BASE, PCC1_IRQ, M32R_PCC1_MAPBASE, + 0x2000); + if (ret) + goto unreg_dev; #endif if (pcc_sockets == 0) { -- 1.9.1