From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 CC1D8156C6F for ; Sat, 28 Dec 2024 06:26:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367177; cv=none; b=mnDFicQ5ociax3k1FER2woa/Z7RO2J96wc6E1MjTzrJwWRyaefEiEMaO5bhHJWK8Ig/ahGYg2x3mqsemgxY1XeSZXD/SWO/FRsfPJeA69b1DHaW9/17h/niP9swE+LKZnMw9B8qLmSF5lrPC6Pt8LEgpGqOB1T59Xj91X01MP/U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367177; c=relaxed/simple; bh=TBVYFpV7cuy2w7egBvciJ32zIp9MVKJVB1lUfRY5u1I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BFavv+o5HduoLGnX6CSh7Nf2XkcLiOC8YamcwEoIvlyFxcKUE6T/i3jA9fyxQlmLaQsxHmwvO2Y9Ja7FHq8my8V79ytwx2HW18Jop7aIXoRRHtwJZ9sWnlQqrjXD5XpPKDXAYUGlHgAcc8nBkrSWetfQsLeqElqsudrrv5BeMhE= 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=VNVTY7Ow; arc=none smtp.client-ip=209.85.214.178 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="VNVTY7Ow" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2161a4f86a3so9162535ad.1 for ; Fri, 27 Dec 2024 22:26:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367175; x=1735971975; 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=mMvlHwoBXtaUcCMp+BA71aUYAVaPu0Te8Yx9Uj0Yv1c=; b=VNVTY7OwXwDwlZh/Y0YbRcQ9eWhDxh/WLs0IRt4qaK8pkGP3cAh0e7ILW6O2X6W6uu KXOyq5XlA8mUC089jePNM/nuI6I9m2YT6Ss14qkWqGJlI3NOy98DMIUSogA16LjOQY+R BuuERomWwmkmpVtw7S23IEvYPAqp3xy+Y1cVpzoVgq5jFRcW+EOYQ+q0VwJpmFSQSEy2 kyrXBKK7AZ43+s9xDtG0adZJRlpueHKheM9dwTrg/c7bEPQgN0ZohEcUBfBveF9+5Pju vT6I0DgIeaQtemHO09lKUaY85GkP7oB6yS8WifCi9hbxsxO5pXzuj6J8FG6u7IVsMQr1 FScQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367175; x=1735971975; 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=mMvlHwoBXtaUcCMp+BA71aUYAVaPu0Te8Yx9Uj0Yv1c=; b=w9Qf/UTB5n0JfqER8Ica2X9VL6c3z41xlmZf9ISuHpc28exg9Df/l65VJtTcHmvhle sVQGwDR8hzxm7A5qIv+msvE/J7eDLv1vDn0jUNOCA3+IoE0qpxUVdIh5945fR5fxQMPz TEKiSYmFZigWo9oD7/Gs6r0inYvpXmwoxJgz0SLcnRIKoKF1SvlCPYQw8VCis2QLbzpx 12ck7E7Ccn5C+m9Cdp+bnT9H5kwRP+a9oVQQLT2sXJV4DmKKBS6JB8MEBK5MkzzYNPd0 0wOLCUpL/GW/qxYl52NbE6rWJhAC7WYk/AXOA7gYh9S9x7tcYWUO4WiJHrEJcK33K11F 7CWA== X-Forwarded-Encrypted: i=1; AJvYcCWgvVcLrHiBfd5N5LyBwWV+8dYXk2RQZJm+2P/UwEgiOXXogdibnaMndaCve8Q+qQQunJ/mVF2UFEvAwZY=@vger.kernel.org X-Gm-Message-State: AOJu0YwUEHiHkWL3OAp/yPunHEQyhI52G+YqPtNlLC9xIN4kpCa3q5E4 eKrZrsOMzsEDojX0guWmEEbHavICiqEnuMVsJij/aItG53IMJRNB X-Gm-Gg: ASbGncvcugd3oQFZFaNpwlWYR7KUPPj/c8kE68WnqpRWenFXtB4w7847in6zRKkkj3m 0OqsW1e6UqoWXT9ZETiN2bEqBj4+XQ3LxMz6v3AVUJlNUNg2+zwwkhfzkJbMrTzQZOxqOuSYEDo ofZv2ocUaoPlTBqohPll9cTeFQHP2EfS2k5UO15qmKgM8ysep6I7jP1H+VU7ee2IQTb4AnbiHii H/hEiacc93v4pRhjkvPYwIRpTZ+YklDrdpMSdBAVkTjRX94b9Dh2o0= X-Google-Smtp-Source: AGHT+IEH02MYFNkRcbTlFsFpAAQB5oNw7mtzW6LSj7AlNDmYrwGltH4vFm26DtKiLuNh9r4/ZJTTMA== X-Received: by 2002:a17:902:f644:b0:215:94ef:6071 with SMTP id d9443c01a7336-219e6f2707amr148339295ad.14.1735367175313; Fri, 27 Dec 2024 22:26:15 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:15 -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 13/15] staging: gpib: ni_usb: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:38:01 +0530 Message-Id: <20241228060800.107653-14-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 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 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c index b7b6fb1be379..c21e35bef3ea 100644 --- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c +++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c @@ -2619,13 +2619,24 @@ static struct usb_driver ni_usb_bus_driver = { static int __init ni_usb_init_module(void) { int i; + int ret; - pr_info("ni_usb_gpib driver loading\n"); for (i = 0; i < MAX_NUM_NI_USB_INTERFACES; i++) ni_usb_driver_interfaces[i] = NULL; - usb_register(&ni_usb_bus_driver); - gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE); + ret = usb_register(&ni_usb_bus_driver); + if (ret) { + pr_err("ni_usb_gpib: usb_register failed: error = %d\n", ret); + return ret; + } + + ret = gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE); + if (ret) { + pr_err("ni_usb: gpib_register_driver failed\n"); + return ret; + } + + pr_info("ni_usb: module init is complete\n"); return 0; } -- 2.34.1