From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FAE6158868 for ; Sat, 28 Dec 2024 06:26:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367181; cv=none; b=FOxm7jNG/covaM9hdNs6Yp2awtwgj5PDWhiO4FWQhepyWUXRzK4S5VyOCNF2gu2+b5jgDJqiHCjLwOcp9fp8D32ZcvixIWXEiuS0H0nPp8pRTsdZRGWKwuJOzTgH5hLBKCbuJ/EPM0qbLOlIlu7wxSOFffCmmNjXvoiTrs2utnY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367181; c=relaxed/simple; bh=XgIP7ydbSSF1qKIvGtwIuD4MnhazIW69u73z/eHeulw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=egYJuaBd8PRonDF/9Tfmi+/h4nh+xEQUJxYPo27GNH9aIYCJT+hkKdBpW7aL1Ds6OeUwAEGZYyuKgdqpwf58uR2N/j3OLvyOHD9HbrrFvisFSV2c3fFi+17ROZ2fAFDxsnZ0r43TwIrgCOdnSa6QUTicdiEGCJIGJ7+pmfKPboo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mj3PBQ3L; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mj3PBQ3L" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2f45244a81fso1246783a91.1 for ; Fri, 27 Dec 2024 22:26:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367178; x=1735971978; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RV2xfTJdjm2bzq9KK7gXgoeX/vt6XGKV0XWnfw/XSUg=; b=mj3PBQ3LHTZIOTSq8GypxMcxz+gyWsYxeCqjp33DwgOJLhPWKbQ6lT796Ect6ordti 9i7LlZEtXWKDeUsA0MWZ0RN9UneRMoiSi9wTRo1iSd0Qg5hlaESEn385UgZlFeyfK9Zu zPlDYKWqfXPZLV7M/DNQzCtQR4zxuUfNdEQNdnm3OwYWQOL7lG3lJmafab93dePS3jQM gnBtLDPHWokaD10SimR2AhOESAM3W6Zkix+ZNTJ6/noqH+Ahoum68/fh/0OGtmUW+gwX p+jzQ6jU9n3enj0I96tB8aruEeV5fH39f438jNa3WYdTTrDk7Ss9zLZgEPKdhAf6zSsx QVwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367178; x=1735971978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RV2xfTJdjm2bzq9KK7gXgoeX/vt6XGKV0XWnfw/XSUg=; b=O/BrJZWfRaInCvGcYE3W5jPyBJ6698RbgAhklyt3xsCagGQWTVvXQX2dYpELMxx7X6 55tOI1CCkG5TfSttoat9lwbURMSCvo7eVyjVvdpPkjQkDeh6cguVlCLL/57Q2XBCyq0C acA0vsVXhTxv9gI7LLUST0WRlZsWfH/cZZLPl5LXJk4drPnYzSZPsd3+IjLFOds9CQoi 5z/rFhsYVvR68e0ZVZ8rgKVrI9SJtj/XjjXl1Z3i1BgKM1/5760Ea30eWFWg/cbU3xmz gPLNOEe+MN5pzFzVA0KBqkQF/mlP2y/KKxPutGdgufQfQmKKF/n7X90ZneDZSSlDLkjV 7TlA== X-Forwarded-Encrypted: i=1; AJvYcCXuCczZG6I4EDRfRAQAq34HvPhgtOxFUMGaVBoRXJ9xqyRBJPbHcae5LySvKORPEQpwNEgTnnDdb+KC2QE=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0PACgEfwvKJcLWs0JI2XC+/LQX1ZNfGvsmRdOw0PVxMbS/Apr lCYbziQi8pslbLqRHimfO9u91DEzUVW4Wtk7L0XMD9+rxfbXPYun X-Gm-Gg: ASbGncvfpiPnjYiLiV1EviuK1QjGn25g7gfhEu9Tg63eQqmJx4ZP0xfHk/it5DAMotX 7DuwDz/veYQ+IEnbR3EBOg98eS7hFDdpo2GKTXeSOEGtVPduexHeYd7fGELfd6+tQO9KuGcNsUO l/BL9V+cjMcPj2Lrpb5iSDop+N5hUfShdMgGIMICy5yQ2JKnJp3Pnl8Sv2bW2fy7OmE1h8gHLbl lbg4R8P0yHZh2JDu0ggog9VQWXzdh3Dbya8WqjAdAQU8n/bPMH0+4s= X-Google-Smtp-Source: AGHT+IG3Y3OdDd1e6JZB0O8cIIzEcIgy1+yiVFKk94rFCnG7GYGL0L5YQpdSR4NKOq1eERWh8aax2w== X-Received: by 2002:a17:902:e750:b0:216:32b6:cf0f with SMTP id d9443c01a7336-219e6f108ebmr162603095ad.12.1735367177843; Fri, 27 Dec 2024 22:26:17 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:17 -0800 (PST) From: Nihar Chaithanya To: dpenkler@gmail.com, gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Nihar Chaithanya Subject: [PATCH v5 14/15] staging: gpib: pc2: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:38:02 +0530 Message-Id: <20241228060800.107653-15-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241228060800.107653-1-niharchaithanya@gmail.com> References: <20241228060800.107653-1-niharchaithanya@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The function gpib_register_driver() can fail, resulting in a semi-registered module and does not return an error value if it fails. Unregister the previous gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/pc2/pc2_gpib.c | 34 +++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/staging/gpib/pc2/pc2_gpib.c index 7b3b34f47341..4441939265e4 100644 --- a/drivers/staging/gpib/pc2/pc2_gpib.c +++ b/drivers/staging/gpib/pc2/pc2_gpib.c @@ -635,12 +635,38 @@ void pc2_2a_detach(gpib_board_t *board) static int __init pc2_init_module(void) { - gpib_register_driver(&pc2_interface, THIS_MODULE); - gpib_register_driver(&pc2a_interface, THIS_MODULE); - gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); - gpib_register_driver(&pc2_2a_interface, THIS_MODULE); + int ret; + ret = gpib_register_driver(&pc2_interface, THIS_MODULE); + if (ret) { + pr_err("pc2_gpib: gpib_register_driver failed!\n"); + return ret; + } + + ret = gpib_register_driver(&pc2a_interface, THIS_MODULE); + if (ret) + goto err_pc2a; + + ret = gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); + if (ret) + goto err_cb7210; + + ret = gpib_register_driver(&pc2_2a_interface, THIS_MODULE); + if (ret) + goto err_pc2_2a; + + pr_info("pc2_gpib: module init is complete\n"); return 0; + +err_pc2_2a: + gpib_unregister_driver(&pc2a_cb7210_interface); +err_cb7210: + gpib_unregister_driver(&pc2a_interface); +err_pc2a: + gpib_unregister_driver(&pc2_interface); + + pr_err("pc2gpib: gpib_register_driver failed!\n"); + return ret; } static void __exit pc2_exit_module(void) -- 2.34.1