From nobody Mon Feb 9 13:00:56 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 ECCB51D416E for ; Thu, 26 Dec 2024 19:49:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735242590; cv=none; b=HvYk45832aiIghBAu9CvhBL6XSUgHFNoJju+jFHU2itXWDxqqlCUHFONlA08gloLoquguQPQZcuCF09P8eAaOSEk7RjTqcoHIfuaaz6dImHT/m+M1jRPDnwBhdm/58zlsUEuR/14R6r8SoS3Jf8MH9jSvLoOdLtyQZn5IgxropA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735242590; c=relaxed/simple; bh=lM4F4tNWhI9bXPIjvz5N58CH3ALV+ujeYhLvFQ2TUJ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AP88tcdEF5mP+V6Oo1VQM9fdPUFxmpxJRVPlKnBhcSaOteQYA/WLLgX33joq5SSOLDx9bhAJl5HEhvbRsYWeR9duXsqU6iZt8mv/Am8qf9DPxSLm1LC3CvtZ8NDptFQUyb7WTvqdqZRRSEk0A/srcZwMGY1sqNgTeAEGOXLadAc= 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=SioG6tzZ; arc=none smtp.client-ip=209.85.214.170 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="SioG6tzZ" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2162f968cd7so8297485ad.1 for ; Thu, 26 Dec 2024 11:49:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735242588; x=1735847388; 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=SaMYoJWCSlwYzZZh/EkMcwMBpZjwpcPJiIs7cTJyhsk=; b=SioG6tzZ5esr8UhSDYbKyPfWTummQ48IivKWs2B9GWADyHBrccCxCwcUTyB6wElakE cVWMy/ILl2GWZrmwtnLtWwI88y3x5orTlAcM5Vn92EyvMuuvNmASkFJRHGo+geaf8vHL kQSh0WIEOwnFReNRz51L3H5QOSi7KDn3Yw6/mIbfzFu7y3gkKJJcg48ksFwcF3UkKML5 XIB/5uPSaBjr2N6gNh8Q/3TPiZu6t8i66msAlgMfpkbWq2l7s5/uNW8hNc5RMwu+ZU/L +/yu3BuGswiSm2DxYWKFykQMLNxa3spl0tX8KT0RGMbKge2RDk9N8DRpVpjxYGAB4MnL J2tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735242588; x=1735847388; 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=SaMYoJWCSlwYzZZh/EkMcwMBpZjwpcPJiIs7cTJyhsk=; b=kwLi6jnrxcOt95GukaxnraZnuUXAYGdWFwBhVLgXvTGJyTVLZEJgZTV1rlL3FTLSAv y89HAsYlIHf7ZSDexy/neibe2SFtMcu0nLSQOPaliWBs3JAV4GQ2he9xUeYWgKiEYqHQ fsdVrY4kfnLIO9/fjCKIu2Xq5ZExBZNXSNuEWvVyE2HtcG9xKxSdv8W02iBgkNgdFZwk eDFqw5eiLf8LaFTLdVyO4NJDX/De6kr9Dm058s1IPN6HEeCRoo9CQgXDXL8VcAJ56McU lVb2+p5Z9sGJ3bAZ9uraMtiSP2N26mAlSlJwOHWCw2ffSkxlTpHajmgktrUfOBpuf8lS 1yug== X-Forwarded-Encrypted: i=1; AJvYcCVuU29iW9uxfa/BTsbT8lMNO0Q21KneaA7l5sMlV2NWNnFqeyX+lvncXgNnMv3cJfg0ZiKEiyRpwfcB368=@vger.kernel.org X-Gm-Message-State: AOJu0Yz13IhWwFUmSyTXofo57BRH/Dy+2sLwwfpZzOJwGcBnk/bUFcMl fe12pI1dcz0blKKLQU/J++tu96zrXDBHS8ntFQm4Uyt/C1ITjko9 X-Gm-Gg: ASbGnctlYICIaije7336harLpFEVvNNZbw0mxzUB7FuG8JT1aVZ9JEtMFT5e5K1GPlV RLbgXxY05R97a2CkwQeWDs6o82RYQS9XnIprXBFxS6taI5foJjmz1ev4UZosllFKDeP6fv3ro/f zzqgyYxSTs4rreG7uVevwdxe9nff8/MvxS11lrD95Q9yeVdNf6T4jezkrazHTK0D0CqZkSz26qs DrmmTNEECnafCtH8Gzi6vJsmp0jmFi2as9w/uacz/uubikuLX05A4Q= X-Google-Smtp-Source: AGHT+IFKEXpSh+f0GaZDDZpL0smypeehq7M391fZ2nFcOvkX0+NwgFglxPr3xc4HbKcntFIcmLMPkw== X-Received: by 2002:a17:902:c408:b0:216:526a:5403 with SMTP id d9443c01a7336-219e6e887dbmr127996065ad.3.1735242588222; Thu, 26 Dec 2024 11:49:48 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842e35d4becsm10304580a12.79.2024.12.26.11.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2024 11:49:47 -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 v4 13/15] staging: gpib: ni_usb: Handle gpib_register_driver() errors Date: Fri, 27 Dec 2024 01:06:37 +0530 Message-Id: <20241226193637.241049-14-niharchaithanya@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241226193637.241049-1-niharchaithanya@gmail.com> References: <20241226193637.241049-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: quoted-printable Content-Type: text/plain; charset="utf-8" The usb_register() function can fail and returns an error value which is not returned. The function gpib_register_driver() can also fail which can result in semi-registered module. In case gpib_register_driver() fails unregister the previous usb driver registering function. Return the error value if gpib_register_driver() or usb_register() functions fail. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gp= ib/ni_usb/ni_usb_gpib.c index b7b6fb1be379..f20a23a023d9 100644 --- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c +++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c @@ -2619,14 +2619,21 @@ static struct usb_driver ni_usb_bus_driver =3D { static int __init ni_usb_init_module(void) { int i; + int ret =3D 0; =20 pr_info("ni_usb_gpib driver loading\n"); for (i =3D 0; i < MAX_NUM_NI_USB_INTERFACES; i++) ni_usb_driver_interfaces[i] =3D NULL; - usb_register(&ni_usb_bus_driver); - gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE); =20 - return 0; + ret =3D usb_register(&ni_usb_bus_driver); + if (ret) + return ret; + + ret =3D gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE); + if (ret) + usb_deregister(&ni_usb_bus_driver); + + return ret; } =20 static void __exit ni_usb_exit_module(void) --=20 2.34.1