From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 9ADB27081A for ; Sat, 28 Dec 2024 06:25:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367160; cv=none; b=G9I0TncotjsnPgwtbIZaOkXCK1k7vc4ECye4L48lI42wWDxZCJWkkPa5s7nXU3oQZM73PJIXNwe1x+8i/cVjOs/NV4b1aieTo7PLTTyuCcBY/Pc6w7qtm03oN/b5ClB1MmFxhQZwmYntYUaI/f6uAVmXQIiPE6p2lbryGwmjNIs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367160; c=relaxed/simple; bh=yVPqatTm3nb3lo+4PPx7gew+RP/CMLCG+wiwCrOc8lk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q32h3IUZ4DAJg3gkBXWVhfMfdkJKetiphKuGfKa+0FigQ/5QqQHCJnq7gdmw7p9R5UhELPrC46jjDAnuEoNauGJhuGhyouKutd9/BIwjnbU/DbuZ8U2vUNmRjRHoxlZoBi+lrlJ3XJCB1EyO78xCJ2eimXy6faFqwmtUWsAF8Cg= 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=eCVc8CfU; arc=none smtp.client-ip=209.85.216.52 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="eCVc8CfU" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2efdaa02378so1545584a91.1 for ; Fri, 27 Dec 2024 22:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367158; x=1735971958; 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=/YrRCMJSbvS2nUHLdxpix76PU/tvLZmPtwFzSlFjSwc=; b=eCVc8CfURSoRa9+qNJ1Mp4hoz70OHq3/tMVz8cTMww/ex35jKy5I0tSzCOootjRDJ1 G5abQL/YBr22grWDA9aKlwV1EZGk4Gf+lL6gkG8zR0NBBXUl/hSpLnC+fmh1xW+CDyBW pnnXLwQpIrr0Z/HzqKc8nkfPMb20tkYyUwNVm6GbdLeN6L+AvVSBNGBxPaA7VF6wxnTG 5laEZVepKmopSgQARaxmV44imYXPeNhl+Es/Oefg1su0CiQKcbUFUaepOgoGIRJxqi8Y gyUS5VIgKCDKHRusL5J6JUXqMTkCffOordGd1w1R6UgkD6GJ+OygvahVFpr7qwwvzD2w 5Tng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367158; x=1735971958; 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=/YrRCMJSbvS2nUHLdxpix76PU/tvLZmPtwFzSlFjSwc=; b=b81otecJL28zN6bLij3b8blRLD2JWS4lNcMbhGG5cGKbWENx3GZhwXTV+IYLm00iuR +NM+FelMZkLAZ7+9mu23i7brnRBfQ5yVihydBNRT4YF/E2XTv8TCLK57P0qApOEHjdcc u0WA+Jp65rrZq5+HT5KvabhEn05XFTUCtIxV0Qj3p8U1uYAnNFcWy6ew3sIljdHEFqx5 vl2j5YJdYQXSEV7WJmN3a1QoQ6ggjHCC7h3PZpm+B4KPQLQE68qkCLGxWWKsQcGF94fB G+6IKQd22Lh1SUXqo226AnVHUUF0ru3brm0fWsgTrKdcPgucqT5zKZ/pWd7wQ/dmcS/w iyZg== X-Forwarded-Encrypted: i=1; AJvYcCX5dwid2bMBFjiWcrNAjlvjdpT7vWS3UjHRV0orwbI18RHqyyvlfa/0bBRdzbvOv/zfhjlFANN8+656XzA=@vger.kernel.org X-Gm-Message-State: AOJu0YxhU9bz84PQUp2KYVEUrCPfgXhJeuVqJ06yeSsRL6gIGrtR+aeS tmVmYDwCQ0Vp9GLepysS280LVfDhzdA2YOsJ3UjvdD4tag/8G9JF X-Gm-Gg: ASbGncsW4whIlXn3cn4cTMoaVkWWetQwaNoeoUT4p2m3FbeB3/MQudHzjuUpRtJV7cS EbsSHZfVb2QWikVl7Lwqx1YIFNBB3EG0+qw2znyLY03cl9FN46AVDIH1eTeOnAcYpxq0pWCbR3j 5lZX5VgiT1p3XQpdNNngJkizP3ZV0AKg6wB4w7J2H2VvxT7SztLky3nX5rqAtzLn4htZmDUBtU+ bJxGD39jSNqHFNXVzTGxgfpHLJfSOJ/0py4IlkBTw6pqcMdUmkTsJY= X-Google-Smtp-Source: AGHT+IHvsTPt3/kXcw4a+tj+/Rbl7RKdJWqzN+oAhYNcuJgjtQAGJULbfP6A4n6S3/5pqDlht54PLg== X-Received: by 2002:a17:902:db08:b0:215:5926:2db2 with SMTP id d9443c01a7336-219e6eadeedmr149427275ad.7.1735367157923; Fri, 27 Dec 2024 22:25:57 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:25:57 -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 06/15] staging: gpib: fluke: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:54 +0530 Message-Id: <20241228060800.107653-7-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 and gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/eastwood/fluke_gpib.c | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/gpib/eastwood/fluke_gpib.c index 3f938ab0c84d..285dd5e5ebfc 100644 --- a/drivers/staging/gpib/eastwood/fluke_gpib.c +++ b/drivers/staging/gpib/eastwood/fluke_gpib.c @@ -1155,16 +1155,34 @@ static int __init fluke_init_module(void) result = platform_driver_register(&fluke_gpib_platform_driver); if (result) { - pr_err("fluke_gpib: platform_driver_register failed!\n"); + pr_err("fluke_gpib: platform_driver_register failed: error = %d\n", result); return result; } - gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE); - gpib_register_driver(&fluke_interface, THIS_MODULE); + result = gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE); + if (result) + goto err_unaccel; - pr_info("fluke_gpib\n"); + result = gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE); + if (result) + goto err_hybrid; + + result = gpib_register_driver(&fluke_interface, THIS_MODULE); + if (result) + goto err_interface; + + pr_info("fluke_gpib: module init is complete\n"); return 0; + +err_interface: + gpib_unregister_driver(&fluke_hybrid_interface); +err_hybrid: + gpib_unregister_driver(&fluke_unaccel_interface); +err_unaccel: + platform_driver_unregister(&fluke_gpib_platform_driver); + + pr_err("fluke_gpib: gpib_register_driver failed!\n"); + return result; } static void __exit fluke_exit_module(void) -- 2.34.1