From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 A885378F3B for ; Sat, 28 Dec 2024 06:26:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367170; cv=none; b=cXU79MbmIH+6WW9PNM7ipBr/juVQfJ5w9E8Z+g3luhsYKxlYurC/rPCPJZFsjccOgkwXZ6ibP1iwYwQtZ2+20fD0lD0BCV/DhQTcWwmaTcPaaFvC+G9QHby13DXXoA95SP63MVVeGNKaKQOZ1S/fk0WMOoLVxfI2pto7msjPB1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367170; c=relaxed/simple; bh=5RPOADarcrakfDotD1CuhKlQhRBJCGEbR9E+aj4sxmQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dgTFSpNqdOHisfmePHKuNogoSglOB1mdbffuQwfBWI5uBIInhOverkJiGbLriissP8dxvgbd4Cx4jsnHadBP4mX11h3ni3ZArpVDoDEdWCT+foRLH7pkTWCZBdbUHlDot/7nypBzXk2zQR6P+YaPxN4XeXS/iCZ5xJZlLopbBJ0= 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=Klngnz/G; arc=none smtp.client-ip=209.85.214.176 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="Klngnz/G" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-216513f8104so10478755ad.2 for ; Fri, 27 Dec 2024 22:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367168; x=1735971968; 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=g4bIH6RGM0z1JJhXp40bqSwGh6KzMQQ7CPOGwKP/Daw=; b=Klngnz/GsijieZJ/r+Y+1LRln3FJKgPYUUp7iuAG4qqYG/eawN1PALTVWDJTNTY5v4 Gi/9eNEqXVlKIIduDvL3bTT2xrR6Bzc7/xw0aYT78z761cJwXDxln2VvZRGhO5J6GBB3 DOrlwWdWGsBAuppuduyQVZTrFv9YIrZdn8LnXxNHeAkNs9B4le4UqP/ShOyGxb5RsJF9 J9unqPcE2ULWWA684o9Ntl0hzUNyQ4ZuqhsWI3ksa/eJge3kJm+G87Gjdjm9NjAI+Qxf ZAYk8fwRwtYyw5d0pPfsPfZN07aJciYoGpwQbjCD7BrueViYZL7Dlm81nnpMSIEgxDjP 5MOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367168; x=1735971968; 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=g4bIH6RGM0z1JJhXp40bqSwGh6KzMQQ7CPOGwKP/Daw=; b=DtgiUkiPhLj/BvLaiWOLnliHnLidZqdORB6sj9r12a3u2N5Bmkfw3LODPWOBwuHjE2 kqwUGwFfP6w67ZMK0Ir5I94Hd2SHxuE0h7yZ//mbZnncA5Yx68FANSSYEC5/vREj2zfe PmtFYieKby0U0NwHJPN7qj7unrNyA9YgQ8KF7EDOaLndwc64bwMZDLHUO2HlBuyaCuLK CKutkUr7OYG8hbYPOEkeHT5G9JsLgB8ARxOiuJIx5DTrYFuI2NSIJUPiAmYAbBHM5v5X 9AoxByhQFAIyAdjXdnhg/Nvea+zn1ZkkzIPMo7guwA8VhAUrMf+TrolopsAoXC8oUFON MSFQ== X-Forwarded-Encrypted: i=1; AJvYcCXafs8aEKrLJFILyQc4j4md1Q6Gg/8dp/w7Xi8gPSiNPaHtPW8Pq17cf/VqL3awGeSWfMm/hVrLkxoMi98=@vger.kernel.org X-Gm-Message-State: AOJu0YxA9jirwmTWPnQg1JDxGtVeFPbxiMQRnC3naR3I4R+GsFXeJF8M +fIfgUBDyWi7kpMASLLpQrUhdBoKqqCIoWuzvObenoPmHCvEqAYD X-Gm-Gg: ASbGncvaFrr5gdNPVCPqODfpx9tJWir4QfMVnA/WKlb5wdGhy/GA2XvGByoJHV0mIO7 XftyVY54P+HXSBs70rPNcJUjxphnSXx3MNCtBkeaImYsQXzQ4yrTYWhOpJ7PQDq6FMnmQkYVLkk UJ0HM5Cb3jHA/w0UOhgXFtFm8rsBEwC2RRKiatnSee6DJV4rgbc6ig577MdR4IrCyf07rGCKy7y LbTKk4lu+vvr564ggpHxBdwPTGRP+1uPuc+L1DOSbhCOuXCbAjwei4= X-Google-Smtp-Source: AGHT+IGTxlsItD+a8SxlZhWTnZItAiFo7zZPWh18ByNq8xeO2EVO9u7NmUA8jRJYh6dcBsSGECDbkw== X-Received: by 2002:a17:903:228d:b0:215:9d47:4897 with SMTP id d9443c01a7336-219e6e9a124mr150181775ad.4.1735367167839; Fri, 27 Dec 2024 22:26:07 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:07 -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 10/15] staging: gpib: hp_82341: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:58 +0530 Message-Id: <20241228060800.107653-11-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. Return the error value if the first gpib_register_driver() fails and if the second gpib_register_driver() fails unregister the first gpib_register_driver() and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/hp_82341/hp_82341.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpib/hp_82341/hp_82341.c index 8ad1c885a9fb..eaeed8fb77c3 100644 --- a/drivers/staging/gpib/hp_82341/hp_82341.c +++ b/drivers/staging/gpib/hp_82341/hp_82341.c @@ -807,8 +807,22 @@ MODULE_DEVICE_TABLE(pnp, hp_82341_pnp_table); static int __init hp_82341_init_module(void) { - gpib_register_driver(&hp_82341_unaccel_interface, THIS_MODULE); - gpib_register_driver(&hp_82341_interface, THIS_MODULE); + int ret; + + ret = gpib_register_driver(&hp_82341_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("hp_82341: gpib_register_driver failed!\n"); + return ret; + } + + ret = gpib_register_driver(&hp_82341_interface, THIS_MODULE); + if (ret) { + pr_err("hp_82341: gpib_register_driver failed!\n"); + gpib_unregister_driver(&hp_82341_unaccel_interface); + return ret; + } + + pr_info("hp_82341: module init is complete\n"); return 0; } -- 2.34.1