From patchwork Sat Jun 7 03:18:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Khoroshilov X-Patchwork-Id: 4315211 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 93577BEECB for ; Sat, 7 Jun 2014 03:19:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB77C2020E for ; Sat, 7 Jun 2014 03:19:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15B10201F7 for ; Sat, 7 Jun 2014 03:19:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752776AbaFGDS7 (ORCPT ); Fri, 6 Jun 2014 23:18:59 -0400 Received: from mail.ispras.ru ([83.149.199.45]:48456 "EHLO mail.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752753AbaFGDS4 (ORCPT ); Fri, 6 Jun 2014 23:18:56 -0400 Received: from localhost.localdomain (ppp91-77-216-142.pppoe.mtu-net.ru [91.77.216.142]) by mail.ispras.ru (Postfix) with ESMTPSA id DE5EB540157; Sat, 7 Jun 2014 07:18:54 +0400 (MSK) From: Alexey Khoroshilov To: "John W. Linville" , Fariya Fatima Cc: Alexey Khoroshilov , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH 2/2] rsi_91x_sdio: add error handling into rsi_module_init() Date: Sat, 7 Jun 2014 07:18:31 +0400 Message-Id: <1402111111-8676-2-git-send-email-khoroshilov@ispras.ru> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402111111-8676-1-git-send-email-khoroshilov@ispras.ru> References: <1402111111-8676-1-git-send-email-khoroshilov@ispras.ru> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix rsi_module_init() to propagate sdio_register_driver() errors. Signed-off-by: Alexey Khoroshilov --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 2e39d38d6a9e..f2991682a66a 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -822,9 +822,11 @@ static struct sdio_driver rsi_driver = { */ static int rsi_module_init(void) { - sdio_register_driver(&rsi_driver); + int ret; + + ret = sdio_register_driver(&rsi_driver); rsi_dbg(INIT_ZONE, "%s: Registering driver\n", __func__); - return 0; + return ret; } /**