From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 3176D78F3A for ; Sat, 28 Dec 2024 06:25:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367152; cv=none; b=Rdlo4qKC1lgp1Cek67onJEUaLT2M0fI5OgSaeGVLc2zMj0lWGTCxcBIUjSp34bLD1ApB2Cr1flwTXptl384QpOwwG31rumDqj44bqrN8H5b4PMlYWbVUaaauuVCEBKTSUUs4IJSdDekbcgHQSDjum5EgSess/2WDduStMoDg/gQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367152; c=relaxed/simple; bh=HknnVdrAoIn+nJlztFHyKmtb+blYdrE12/Hfb7B4Ry0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GiNonCFwbnaCSTcpKwLJwHhs/qEhcln5VYdPY7qY7Fu3C+nz9L+/b0DVf5Sgpz1X24L9xODUbTWrLqTyVkSf346anzFygabOqQ6vwkPuSaxjVR+185Qslr9ZV/vwF1UR34SRm1JzfYbi8ozSdsKdSjlrP1FS1w1GcLQ1RXBA2M0= 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=K/A2Bkin; arc=none smtp.client-ip=209.85.216.48 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="K/A2Bkin" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2ee8ecb721dso1544692a91.3 for ; Fri, 27 Dec 2024 22:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367150; x=1735971950; 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=wSh3xNoLQFQmdQLzK1pTKKth0n6UyT1o++fQHR1qDiU=; b=K/A2Bkin3jOkWI2HrwBxeQRKP2uQOew5rux4C+rZiq11Pg+FYfUtH4rJqIYwIe8O8m ZTJhKNz11M0VQ7iNV48DmSq8mQpCfMhdtHST4ls7Grj23RX7QrsQIhIojnm75A9R8tgO qcAPD+zDW6k+bORQQRsKqa5KuiCy2V1o7FmuQtQsz2qrLsjruAICmRLrvO+SLlsucxK1 sXOvikKvB8cKEPODSu+8YQqX2isrMIt8LUCI1mqGPnax+GCxganimbByHp80HpjF5drG T28lA9nOuG+dDFEkYTfnI3ZXa7iX+WG1iOpTwXYldT3tfHCAHWNqJZz2QMmFLAMtaZZu eqqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367150; x=1735971950; 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=wSh3xNoLQFQmdQLzK1pTKKth0n6UyT1o++fQHR1qDiU=; b=PzGotCx6CShQX0kQmsea+xxV8y2HS1mep6YsG2JCwZ3dUGwLAgguo6/6KkZqhE8/dh NRBLlyHEs+g1whizuAwAvEdjpgvjL1bBt1bCC1++aNgyEztZ40De8GtiE8ERcbTLRNA0 wri6fVf3+q4gXP2KG4UPUDaqechqFcdwlrQdFU14xC1QTzKDkxd/Hg8CXR13c+65yC1A yqVwVUNMdVKQW+rb4o1FVUj07m2mD+hU2N2tXHReqqKu1bBZ8PHWYNixk5Eu+Kl7eD58 V/K0bGEi2OKdEDdAx0WPi+fuuN07rO0ZSVOyfntDcKlaBoGQ11QBG/UhGGocECAyiLYQ HwnQ== X-Forwarded-Encrypted: i=1; AJvYcCUNaX8+uDUCOtqSQFRUNn0sHU+7oHGysoVW927G4vMIJTz2UghjehAWTQxCq8+34OJ7c+HgzW4mj1QF4AM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5VREbxKvncGRtkeObhI8br8/QVeqBFFqU9NEBrpZ4t8fCt1FH o2bFb50JZJtv/wkF3LwVVAvtGHJtwo6bupXYqUNpkmmfm990lg0v X-Gm-Gg: ASbGncv5NWzwGFYznSIBLrhv4mZH3u/4VomYVTsziDQDmHIZebK+jMwxLCuEAVae4G5 FnwDrJt2Z1cQgPIy5oey2lj13qTQL/tV0HyvnwbKFEuvMgsjJv6uffWqTzIG8FfAZVgOrDbNSPj Vi8+CEmGjyAn6a4rEoLJZCTCT3tti3dt3BNqP4XwJYAg9ixFGereFXa2Gg4NXL1Vgra3FM3CxVz U1bDkcN2M+k66CCzaS6kWJLnOg3ixWvqQGSmj2Inirq4YC6VW7u/ME= X-Google-Smtp-Source: AGHT+IEEWV0KnOro+hzZZLFsGmGRJxKNa/TIO39gqgWa2GS8AeZDpp8NzAXVKLfkRDP6jBl2qldaXQ== X-Received: by 2002:a17:902:e845:b0:215:3862:603a with SMTP id d9443c01a7336-219e6f08c61mr149054125ad.10.1735367150450; Fri, 27 Dec 2024 22:25:50 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:25:50 -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 03/15] staging: gpib: agilent_82357a: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:51 +0530 Message-Id: <20241228060800.107653-4-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 --- .../gpib/agilent_82357a/agilent_82357a.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c index bf05fb4a736b..4bdf6ce54622 100644 --- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c +++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c @@ -1691,13 +1691,25 @@ static struct usb_driver agilent_82357a_bus_driver = { static int __init agilent_82357a_init_module(void) { int i; + int ret; - pr_info("agilent_82357a_gpib driver loading"); for (i = 0; i < MAX_NUM_82357A_INTERFACES; ++i) agilent_82357a_driver_interfaces[i] = NULL; - usb_register(&agilent_82357a_bus_driver); - gpib_register_driver(&agilent_82357a_gpib_interface, THIS_MODULE); + ret = usb_register(&agilent_82357a_bus_driver); + if (ret) { + pr_err("agilent_82357a: usb_register failed: error = %d\n", ret); + return ret; + } + + ret = gpib_register_driver(&agilent_82357a_gpib_interface, THIS_MODULE); + if (ret) { + pr_err("agilent_82357a: gpib_register_driver failed!\n"); + usb_deregister(&agilent_82357a_bus_driver); + return ret; + } + + pr_info("agilent_82357a: module init is complete\n"); return 0; } -- 2.34.1