From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 30D95136672 for ; Sat, 28 Dec 2024 06:26:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367162; cv=none; b=ssRaVceoCpD+iktZ7pcSB2RHaOD/fkhFAxn3MNTAMru28JNIvxnpyd/reIzvzj646NVf2uW2+4oWWOnBe/PA5GAVIQ36eeSfy9jNGyBd5/Tjw33WPCUIuqSaX/fJcnekEwzWVvMkefD/T4cwged06u5hbVoLR4V5YGUs5yw+Ouo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367162; c=relaxed/simple; bh=AvE+ZEF1+f7iIqwQfu/zbfsAvnIPkCkHKVLb4bhyW1w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kSuNFqd/Cet9TIs3oVtPh/IINckqaFKxMSBguruyrKKQ+pMrh9B3jDewKbgFltePLTTqfQgo1iqK2v/n/J/OOG7RUfENWmpnIweaDH3j37mcQIpGywBrzCL17nDggjx+ewGNzQIr1yJeHHj+ecDYdmKEVKtop9YWDCB+qS10BUo= 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=Zop7u13R; arc=none smtp.client-ip=209.85.216.47 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="Zop7u13R" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2ee534d6800so1538261a91.2 for ; Fri, 27 Dec 2024 22:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367160; x=1735971960; 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=i10RE9zyD7IP91+uzWcpn5RslSFQwdTnI7L0HSG2m5Q=; b=Zop7u13R0robf0oKsBfdDjcwdsjczCyiYy7PVsNE+pX66y5ekI4JGaQg+JUHe32/1H KmfuwkSHFked9t+j4mDKq5Q44I80Yk9O73gYmpRukoJ13Qn5rx805Pxy1OqiQouMlHXR BYyp09WJxq2bQ4TpS8kvxU47s/xkW1YD2/f2BWgbsjf6emowNu4fY8Uev7Y6WRjkRzey EEr6DPIFalgieWnXMYLtPdQpG3MF1ztGi3+MvlW8VflyqY2XYlmJbcvnkIPjDqxalUZ2 suQnaSpJ96ee/3zzTQ/wxUA7TqPfIE8Uyk+OV27FXS5noUUCcDabz6G48/bFM8PoDgWt gXsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367160; x=1735971960; 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=i10RE9zyD7IP91+uzWcpn5RslSFQwdTnI7L0HSG2m5Q=; b=iFLrBQl6iDSv8rJnVO3qq7zphPjhrtN7bG4zDaBXtII3pH7JFt1P9kdDqEwDZ9yqCh WIHpO/ck/1IrJCYAaCg18cC3ND5tz9cYq+fGAzrblwITtjhvMYChVid2KLANqEtab6tu 9olod9m2vUbIukC83OrqIWZY2SbJhapmEisfl7y67UAn28Uii5mtjQc0N3GLRZccPq3F ZVXS12BOCEd3bWojwAexGAbzAQQPySGWIuwFuHm2JGjhCLdZkhzCLh9JbcJFaimCQMVF XeSqi87SPEoHUZloIgROcDl0IbSiqMDbArrwA7OcRwSjo5ncXbTxjXFPOGShboVTNuTX 6qyw== X-Forwarded-Encrypted: i=1; AJvYcCXrZvsEQqTAWNoCkkxakbxJSNote6WQWMTEy8NQOQBUYk7v0lHRyquRI+s6QrkdqCk/I+84RvLsB67/R5w=@vger.kernel.org X-Gm-Message-State: AOJu0YyQ+2whAcz1FOrhBHQgqVr1+/6zSYVozQd4ZnLPv55+C37VV9z/ bnbaUnEN6CBLIoXc0vX/wlsRlSl1mgJkCZ40Do7W8QjwDiLSdgz+ X-Gm-Gg: ASbGncsax3HEKbJN3S8hIGE0dP8r9ZhvjbsbhY1XQuO8ecHCaBv9eBkMk+qr1u9yZ4C J6IwSKzYM9MLX0JbTPy0KXPzbydTi1E/IweRfCfajf32nxQUrihcjjEiELib/of2d5JW2VNDhvd cu5P8SSDnx7luTeFSXS8upVyhiHL44g/T58xkMNqbeDuLB5OJPReC98dNUSX3j/ewYa+mdQvIco JhN53moPlD7KnusOQNZRRF9rsu3Ali0kSsj4ZfJTQbfPRrm2nDJKfk= X-Google-Smtp-Source: AGHT+IEy/vLKr5CPV9VdQQEIwlzat6XJdWEUeFpDUgNsbgZcgmg+P4UVkPQNt+X6+/m7hOupwakBLA== X-Received: by 2002:a17:902:f542:b0:215:b8b6:d2c4 with SMTP id d9443c01a7336-219e6e9a23amr150460235ad.4.1735367160439; Fri, 27 Dec 2024 22:26:00 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:00 -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 07/15] staging: gpib: fmh: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:55 +0530 Message-Id: <20241228060800.107653-8-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 platform driver, pci and gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 41 +++++++++++++++++++----- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c index 62791db1c34a..dbade677391b 100644 --- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c +++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c @@ -1691,23 +1691,48 @@ static int __init fmh_gpib_init_module(void) result = platform_driver_register(&fmh_gpib_platform_driver); if (result) { - pr_err("fmh_gpib: platform_driver_register failed!\n"); + pr_err("fmh_gpib: platform_driver_register failed: error = %d\n", result); return result; } result = pci_register_driver(&fmh_gpib_pci_driver); if (result) { - pr_err("fmh_gpib: pci_driver_register failed!\n"); - return result; + pr_err("fmh_gpib: pci_register_driver failed: error = %d\n", result); + goto err_pci_driver; } - gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE); + result = gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE); + if (result) + goto err_unaccel; + + result = gpib_register_driver(&fmh_gpib_interface, THIS_MODULE); + if (result) + goto err_interface; + + result = gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MODULE); + if (result) + goto err_pci_unaccel; - pr_info("fmh_gpib\n"); + result = gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE); + if (result) + goto err_pci; + + pr_info("fmh_gpib: module init is complete\n"); return 0; + +err_pci: + gpib_unregister_driver(&fmh_gpib_pci_unaccel_interface); +err_pci_unaccel: + gpib_unregister_driver(&fmh_gpib_interface); +err_interface: + gpib_unregister_driver(&fmh_gpib_unaccel_interface); +err_unaccel: + pci_unregister_driver(&fmh_gpib_pci_driver); +err_pci_driver: + platform_driver_unregister(&fmh_gpib_platform_driver); + + pr_err("fmh_gpib: gpib_register_driver failed\n"); + return result; } static void __exit fmh_gpib_exit_module(void) -- 2.34.1