From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 31ACF35960 for ; Sat, 28 Dec 2024 06:25:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367146; cv=none; b=Cvf4bV4iknW2+xpULV6wSu1w0KLciGa1lMPWmME0ka2rrsXL7ULj13MjIZjzO10sudd+9xuV/+y0/IF5ALh+oFSyLoELlVxhHy/zD7X77k5wZHF96opXUJcmEzAfGc2/aRWL3Ii2BjbDSuk7D5MeMVkukVcWwqbMHNj4IRR/boM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367146; c=relaxed/simple; bh=hUxZ8FrvpBx9aXpZcCXs3Uo5cPIbsMPecSxvj8HGdKg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Cwib7hxbWWW9Ao1O74irzb/UvP4rxKJFPz7bppxPeOaCtKP2fEB2sYFl5ZWqxCVsyxJfrBkz5RpQzaWO8Of8JuGleHjvzrCK4sfdNApeF196BHouZb67qHdfFl2BVgbtWFn51q6HVJh1l9skW4RyNwAGb8mvjPed8aV0aCqzn64= 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=SQooAr/5; arc=none smtp.client-ip=209.85.216.54 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="SQooAr/5" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2f2f5e91393so1329447a91.0 for ; Fri, 27 Dec 2024 22:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367144; x=1735971944; 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=CLv/TrsqKNLXFPXLidmCmK90WVqyL60WkqeVoeLIKIs=; b=SQooAr/5CkouVszMV4T90MQtvJsOFT/O1qaLCKygD2Isaq7eS70GtBStDOiFU6760e cgAE20u620/g97Ue+N+GfU5SCmT4nj7jT9UdT4OrgFQpQW+e/S6QaYh+IIzICf2HcpYQ hrm30ArnxKSvWsUu1CLYN8H8/npe2x3iRK/a8jAImwwpFrEKFGhp2O9Ibnm8hZDTqWS1 tNqpGyEInNi0FLt+H0j3yamn2DWrA604BxRaId8NhF0WYTyENfx8ID307px6mxBPoozG YvP3nVAfw9qJAAQ4+PWPo79gzpm7JbJ6JsXPPi0VD6c3YNBwoxRtnoCHnAB0H4IrRPph rbWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367144; x=1735971944; 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=CLv/TrsqKNLXFPXLidmCmK90WVqyL60WkqeVoeLIKIs=; b=lkptCSL5YNS5TS1Y1VaMgZlnhO9gIOk2iZp2+YLjcIFGPawXI+BYRoXwRL7Y/Ou0cM /pmD8w4cjSei9UjxhFxLf40TxLEDT4Y7tiQkKaJ0gz5o2bq2zLVPZ9wDwAsPpX4StAxq 85uBZ0DcMqNdTq1GS4pPvcDL2CZo+w+TlZ77+IYY548MGHfTazraog0yH626MaGaca7s lq4dY0dKTYOUcegYU7EpnEGYbmHcPR/HWjvyidYrU67LAtypBn0Gbu8DYeCT3M93EnA8 EMg5F9aZgYMb/J5DGdhIm4qwLszyUDEqe0jnwc5D/k/FEoPxhWljQRQ/oVacfM2ugpTp nRLA== X-Forwarded-Encrypted: i=1; AJvYcCVnec8mt0odkRVVVY3V+wxOnXGhqNg9iH4ssnjE4jOb1X6WV3riHDTLSg8ubPZ1T7gxTy897zIc11qLwdc=@vger.kernel.org X-Gm-Message-State: AOJu0YwVoQ7gBd2KPk2oN7IqFFf0k8zxkPCEAo1Aw+EtTCUAsXm1+Rk8 w1ZGq26zIFZO6dWTeZOATRVuWCReYyb0gZSF8zPvFgLUc9BMD8IU X-Gm-Gg: ASbGncvOvkf9GfoTo/DWEOJq22ebTgOeGweXnidhSwi0djEpwf4yP61G8bHnHLi3Rm/ 6UY7qk3fdCUPmdc0Ei7zvdqEmhKuP5AP561wzfnf8W+yEZ2N2FJOmjiHPAwHnKVw+MiKU4vVh5C ia1mQNoUoLfFlML/ySoFZBo2DUS2h/ge+EVi6W86GPbFL8s0NyNFfIfMwM95z54pPsOAFTtgBpM sAm9VSoHVgtSpxKZ6pPQ5d4/qHqmNTNBFBX/yPIRZj2LaprpPKpbxc= X-Google-Smtp-Source: AGHT+IG6+h6YfUGxLZ2dRC+aXcdBRJjWHdaWKAQHDgTLK7vryRIgHyU98oxdi8ypalEacL9fGWFH0A== X-Received: by 2002:a17:902:f64b:b0:216:30f9:93c5 with SMTP id d9443c01a7336-219e6e9e81fmr156977005ad.6.1735367144443; Fri, 27 Dec 2024 22:25:44 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:25:44 -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 01/15] staging: gpib: Modify gpib_register_driver() to return error if it fails Date: Sat, 28 Dec 2024 11:37:49 +0530 Message-Id: <20241228060800.107653-2-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail if kmalloc() fails, but it doesn't return any error if that happens. Modify the function to return error i.e int. Return the appropriate error code if it fails. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/common/gpib_os.c | 7 ++++--- drivers/staging/gpib/include/gpibP.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/c= ommon/gpib_os.c index 405237d8cb47..07795df3b721 100644 --- a/drivers/staging/gpib/common/gpib_os.c +++ b/drivers/staging/gpib/common/gpib_os.c @@ -2094,18 +2094,19 @@ void init_gpib_descriptor(gpib_descriptor_t *desc) atomic_set(&desc->io_in_progress, 0); } =20 -void gpib_register_driver(gpib_interface_t *interface, struct module *prov= ider_module) +int gpib_register_driver(gpib_interface_t *interface, struct module *provi= der_module) { struct gpib_interface_list_struct *entry; =20 entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) - return; + return -ENOMEM; =20 entry->interface =3D interface; entry->module =3D provider_module; list_add(&entry->list, ®istered_drivers); - pr_info("gpib: registered %s interface\n", interface->name); + + return 0; } EXPORT_SYMBOL(gpib_register_driver); =20 diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/staging/gpib/in= clude/gpibP.h index 5fc42b645ab7..d0cd42c1a0ad 100644 --- a/drivers/staging/gpib/include/gpibP.h +++ b/drivers/staging/gpib/include/gpibP.h @@ -17,7 +17,7 @@ #include #include =20 -void gpib_register_driver(gpib_interface_t *interface, struct module *mod); +int gpib_register_driver(gpib_interface_t *interface, struct module *mod); void gpib_unregister_driver(gpib_interface_t *interface); struct pci_dev *gpib_pci_get_device(const gpib_board_config_t *config, uns= igned int vendor_id, unsigned int device_id, struct pci_dev *from); --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 A5FB078F2E for ; Sat, 28 Dec 2024 06:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367150; cv=none; b=MEkns3iPrKtiOsGWGJcXNV+qcLeDV/EzSA6b0C4TlCzqfXTVvmrjtS0K+pswTL9UXb4MIpLN4qzRCDesu8azHFzUmVD5BbEcD1a4FNgoL4OxNf6EtHSvcXpRPuVyJ2HcBWBeSRqg4P/SQgwlIbJ7mPMjm8980qhjgXFqSTmv9J8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367150; c=relaxed/simple; bh=Nq61v8RMzyneNeymEZ1NLFy0QiAXyCgfX0BhdnsRW6E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kVvftWTU7AsguUgqpeJDjtx3/LONoIO4wsAhy4uIRhHJX50SX47ji5Er5TwhCj+uugEUOQGi9k+eATMz30p59OZSn+mX64reBjzCVDbW4Wo3N43EyESU4IMyHJIjjYGy6/VX2l8IHw6HifrUQCjz1AkZFXbIaw3N+fOph+gueG0= 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=EDB3rIRz; arc=none smtp.client-ip=209.85.216.53 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="EDB3rIRz" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2efdaa02378so1545565a91.1 for ; Fri, 27 Dec 2024 22:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367148; x=1735971948; 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=wGrBqX+xpxpxBlqNE5E6JAoQcVz1pBQLxYqkf+Ez3Qg=; b=EDB3rIRzhvmV6KWPtFn70RQEdp6L3GEHuCYb/MBEHBNCDtqjYuZuImPwdfqSSZ2802 pJR0b+8+ZgeVDD9vGKQzTn+bkETjUlO8ApvlcsH6kEB1jdIVgXdv3nb+uw6fCb2AviR2 snqh4F26LNjU2VBsBZ+/633T7vh9jKJTO2q/EXwipmbLfMEa1x+jew0M8rkm82XBRK6Q fmFQhMh8svbn2E9knnPnq61msttA+BRIyoIeNtiVIFnUHAJr7viJEIPaIkkC3MKooU2H ZHo/h3tC7Zr1kYxAvQSHhg7+mfQFxIFjbJldypK3dRcP5R7PabvjW6hmQij52dI+rkBT DHKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367148; x=1735971948; 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=wGrBqX+xpxpxBlqNE5E6JAoQcVz1pBQLxYqkf+Ez3Qg=; b=HcgGlVKJAm4hB/2Yjao/yyF0C3p3jez34E1tsGTvZSD01rInEZpvnExSqfeMicwiNl VERcRKcVyFmNmRLhD3iGgazWuHwXOXcQBwWYEOB+pot8lpwhP8QDfwpcNeIRG25kYktS bkIk/HbOrJKGv58ng+KE8MFaB9ZCnzTlcwLOCc4VPRXe5XUe/oAAkV9QuIsiPH6QWAZB r9sOFDDBrCUi8iG7WC3C14286VjVfEIcLw/Kt//8fVxwt1PLbHZWM/Bt7qq3QhYDZups KeDtZtkwwIutDe4uWiAYntIbN5c1Htzq123n+XM2SE9/HpkFMwlRcUNkJsrQHbxYwhaC eOFA== X-Forwarded-Encrypted: i=1; AJvYcCXv1FnYrQkikQp7T/bhgpr/Ejus0K04wYbB5Dgi3Fp2SGFyUQdz8ZpYC1+9b2DTOWl6RBaR9kwTv7G7sVU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3Sx0Chi0hQElRB+gSHTSG1Bd21+7Jv17bea87reM3OCs+oZJR rNT/CMsm6bAW888KV61NbYIbV4lUdjts8UhQl8YQuka1DbbGMsNq X-Gm-Gg: ASbGncvh//TDrFB4AJcE5hKmt+bzio68gNwbSPisqRBdO+82RUvCfC5GFLosJoautLw ED5hniOLqfSiaAk60jWsaQAmaSxXqhtxdVPrOnk5UAg12LlLf9oL5l/zXFnYIs1+qdv6rSt3Sv0 f0xd1eJ6qunb9ONzRqgpY3JvOV7E1J2kLNH8wmaK+r36yTSalL7dD+UTb/RgF9panIzD0UVkmkN 9iqBe8Vx/FJIeaeyQi2u2GPsccV3cKs3+Ex/DDW9wacBB8fq45HzIU= X-Google-Smtp-Source: AGHT+IE34WJugC6jURtwoi13oo0OTuvDFgEtZV4kGJozVg9xwI731BZFEIKt0xrgOXddLKrN/0DlYw== X-Received: by 2002:a17:902:da8d:b0:215:a3fd:61f9 with SMTP id d9443c01a7336-219e6f23908mr149428545ad.15.1735367147931; Fri, 27 Dec 2024 22:25:47 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:25: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 v5 02/15] staging: gpib: agilent_82350b: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:50 +0530 Message-Id: <20241228060800.107653-3-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail which can result in semi-registered module. In case gpib_register_driver() fails unregister the previous gpib and pci registering functions, return the error value. Signed-off-by: Nihar Chaithanya --- .../gpib/agilent_82350b/agilent_82350b.c | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers= /staging/gpib/agilent_82350b/agilent_82350b.c index 53006d0cc79c..6f077ede86a6 100644 --- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c +++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c @@ -910,13 +910,28 @@ static int __init agilent_82350b_init_module(void) =20 result =3D pci_register_driver(&agilent_82350b_pci_driver); if (result) { - pr_err("agilent_82350b: pci_driver_register failed!\n"); + pr_err("agilent_82350b: pci_driver_register failed: error =3D %d\n", res= ult); return result; } =20 - gpib_register_driver(&agilent_82350b_unaccel_interface, THIS_MODULE); - gpib_register_driver(&agilent_82350b_interface, THIS_MODULE); + result =3D gpib_register_driver(&agilent_82350b_unaccel_interface, THIS_M= ODULE); + if (result) + goto err_unaccel; + + result =3D gpib_register_driver(&agilent_82350b_interface, THIS_MODULE); + if (result) + goto err_interface; + + pr_info("agilent_82350b: module init is complete\n"); return 0; + +err_interface: + gpib_unregister_driver(&agilent_82350b_unaccel_interface); +err_unaccel: + pci_unregister_driver(&agilent_82350b_pci_driver); + + pr_err("agilent_82350b: gpib_register_driver failed!\n"); + return result; } =20 static void __exit agilent_82350b_exit_module(void) --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 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: 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 --- .../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 = =3D { static int __init agilent_82357a_init_module(void) { int i; + int ret; =20 - pr_info("agilent_82357a_gpib driver loading"); for (i =3D 0; i < MAX_NUM_82357A_INTERFACES; ++i) agilent_82357a_driver_interfaces[i] =3D NULL; - usb_register(&agilent_82357a_bus_driver); - gpib_register_driver(&agilent_82357a_gpib_interface, THIS_MODULE); =20 + ret =3D usb_register(&agilent_82357a_bus_driver); + if (ret) { + pr_err("agilent_82357a: usb_register failed: error =3D %d\n", ret); + return ret; + } + + ret =3D 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; } =20 --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 A69AE78F20 for ; Sat, 28 Dec 2024 06:25:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367155; cv=none; b=PbdkkfGbp58gNX/ao1NWgVlKU9y5G/kgze7FfSzy42CLBCabrlg2x51nYni+rVQ+rT0epgZBI7GgrM5KvnsEHgrg6GTNG797KSpIL1ND3q3Xz4JW3goDSMXksfg9shLQN4MS7u4wmnNZFsnJ7FWvdzGlC0sEfAkEXvl3lGMOwW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367155; c=relaxed/simple; bh=Tutpev983z6EE15OjUi5XdAWR2lrO2rhXSSiQQA3rHs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f5a2VR+6QkCmjUPNfpxVcHtmqRrjwkm/BT0Quh5r0Kxyb5Agj1YN4ptn1XnR1snIeQmij+0wsfH3bZtcIsUVqfNBWHZoztf59NPgX+Tpw4HLNiaWXMa5O0Hl9DYlLkBKcvxtftSuuYI9dcKQ3ElnEBeFRl/CC2Xp5NWuB6JIHzg= 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=Syybj6xB; arc=none smtp.client-ip=209.85.216.50 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="Syybj6xB" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2ee534d6800so1538244a91.2 for ; Fri, 27 Dec 2024 22:25:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367153; x=1735971953; 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=tsT73hso6zzbcSoDclkqzX5laGnzjqz54vFNN1iVypE=; b=Syybj6xBrXSRBq2rccgTVe7+NZeMEsewMlTgVfHtwSXbuf6Ddym2okSGAteOOGZDHK 9ccQXkWRUYm1MCdpikJ5Qun8fFbKMQOWCsnOB0sFQY+5Iu2CZl85klHTEBgQ2bVv1sbh R7HAW6RABLG79+xw7HfAAfC9q+OJl1K55W2eDBaouGpyQ/MHxMkiKaDgaJFX6qtsrbti ujDWOq27bgiGZx887EuHstQfbb0S/bBcR4lOiSpM03ZqeieNiKXXL/fiYVBjZqZV22kk dFsjshlQcDF94y+5Vuu737j4v1REhGGHkW0Jns/CrWp23X/gp5ftLJlS6z6QebRaEMo8 Rtgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367153; x=1735971953; 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=tsT73hso6zzbcSoDclkqzX5laGnzjqz54vFNN1iVypE=; b=t1Knzwm//hd/3P/wyN6x4V9l/yTk2VVrPHM9OvmTzfSKgd52XobtlruID+H7ECISMC kJIHr2qia3ebAfS9mDqjkFlW7cXpw01ViBi+f66T/CySF9lBenCUX1pttFspl60geYpG 6gyLRX6T0c5d2OngdbCKaF327p4Wpkqsemx6qthjhMCsXXH0eCH5Jzk0k8XSVj3xPhOK FGGonDSvbl+SSkZ5wiwUZthinXERy2i1rDTys97uTOV4COxNjK0zVy8BHl51rv7i7YZi BdkGlGT3fqtjlE8P1IAHTxYxd7SnJf+nHwWyKwRnMGB0ezvjWf0pk6dQdXlUHAE7vHty 5KlQ== X-Forwarded-Encrypted: i=1; AJvYcCVGOHpXkyn59yrV2vXg6KPwe1cIZTzzOvmlly8CNjvJdxSErhTWkD80Kh6/YObMKrXXV01olWgydXZNxvc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/BV1TWm75yR+S2AxQHPX3oKIMkqXrvVw1Clix5n7sfYw2qe4y MHnAYae2wCgWgxWciUJO3efLlhKdJAIpfk6+s52hxcKg2iesQQlk X-Gm-Gg: ASbGncvTphmnXY0EcssAkzNZ4od7Npa9IevOIt/W6Kv21y9K0yUoonlKBMqOcY+YSj2 MzUlZrDSTIP6rqU2bsM1ygOl01dy9LMxoQQf5/uBy5op6zgOpHX/299YQYifm/k9e5SRdXvI74m qiEdHr3y5b/TGUYwM3dDhdp6olRxlbxtEwzaVdb5PJSCm8UU894jdwodyGdxKKL1+TmzJ5kThUi XLVSkT7kE0rhisdpxFynUaSJDq7bIh93uiU30bZkGmmoerlgI6+IH8= X-Google-Smtp-Source: AGHT+IF0Pe30NOhHyAAIhuU6W6LxnWszRwVxuCpdG8J1K9xDRtKCOXb/KZKzensDsAwu0MMfuXptFQ== X-Received: by 2002:a17:903:2a8c:b0:215:9a73:6c4f with SMTP id d9443c01a7336-219e6e9de89mr155301085ad.6.1735367152936; Fri, 27 Dec 2024 22:25:52 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:25:52 -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 04/15] staging: gpib: cb7210: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:52 +0530 Message-Id: <20241228060800.107653-5-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function cb_pcmcia_init_module() can be replaced by calling pcmcia_register_driver() directly. The error value from this function is not returned and the previous registering functions are not unregistered. The function gpib_register_driver() can fail and similar to pcmcia_register_driver() function failing, the previous registering functions are not unregistered. Replace cb_pcmcia_init_module() with pcmcia_register_driver(). Unregister the gpib and pci register functions if the subsequent gpib or pcmcia register functions fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/cb7210/cb7210.c | 99 ++++++++++++++++++++-------- 1 file changed, 73 insertions(+), 26 deletions(-) diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb= 7210/cb7210.c index 63df7f3eb3f3..99041ee007bb 100644 --- a/drivers/staging/gpib/cb7210/cb7210.c +++ b/drivers/staging/gpib/cb7210/cb7210.c @@ -1351,12 +1351,6 @@ static struct pcmcia_driver cb_gpib_cs_driver =3D { .resume =3D cb_gpib_resume, }; =20 -int cb_pcmcia_init_module(void) -{ - pcmcia_register_driver(&cb_gpib_cs_driver); - return 0; -} - void cb_pcmcia_cleanup_module(void) { DEBUG(0, "cb_gpib_cs: unloading\n"); @@ -1506,32 +1500,85 @@ void cb_pcmcia_detach(gpib_board_t *board) =20 static int __init cb7210_init_module(void) { - int err =3D 0; - int result; + int ret; =20 - result =3D pci_register_driver(&cb7210_pci_driver); - if (result) { - pr_err("cb7210: pci_driver_register failed!\n"); - return result; + ret =3D pci_register_driver(&cb7210_pci_driver); + if (ret) { + pr_err("cb7210: pci_driver_register failed: error =3D %d\n", ret); + return ret; } =20 - gpib_register_driver(&cb_pci_interface, THIS_MODULE); - gpib_register_driver(&cb_isa_interface, THIS_MODULE); - gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE); - gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE); - gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE); - -#ifdef GPIB__PCMCIA - gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE); - gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE); - gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE); - err +=3D cb_pcmcia_init_module(); + ret =3D gpib_register_driver(&cb_pci_interface, THIS_MODULE); + if (ret) + goto err_pci; + + ret =3D gpib_register_driver(&cb_isa_interface, THIS_MODULE); + if (ret) + goto err_isa; + + ret =3D gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE); + if (ret) + goto err_pci_accel; + + ret =3D gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pci_unaccel; + + ret =3D gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE); + if (ret) + goto err_isa_accel; + + ret =3D gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE); + if (ret) + goto err_isa_unaccel; + +#ifdef GPIB_PCMCIA + ret =3D gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE); + if (ret) + goto err_pcmcia; + + ret =3D gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_accel; + + ret =3D gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_unaccel; + + ret =3D pcmcia_register_driver(&cb_gpib_cs_driver); + if (ret) + goto err_pcmcia_driver; #endif - if (err) - return -1; =20 + pr_info("cb7210: module init is complete\n"); return 0; + +#ifdef GPIB_PCMCIA +err_pcmcia_driver: + pr_err("ines: pcmcia_register_driver failed: error =3D %d\n", ret); + gpib_unregister_driver(&cb_pcmcia_unaccel_interface); +err_pcmcia_unaccel: + gpib_unregister_driver(&cb_pcmcia_accel_interface); +err_pcmcia_accel: + gpib_unregister_driver(&cb_pcmcia_interface); +err_pcmcia: +#endif + gpib_unregister_driver(&cb_isa_unaccel_interface); +err_isa_unaccel: + gpib_unregister_driver(&cb_isa_accel_interface); +err_isa_accel: + gpib_unregister_driver(&cb_pci_unaccel_interface); +err_pci_unaccel: + gpib_unregister_driver(&cb_pci_accel_interface); +err_pci_accel: + gpib_unregister_driver(&cb_isa_interface); +err_isa: + gpib_unregister_driver(&cb_pci_interface); +err_pci: + pci_unregister_driver(&cb7210_pci_driver); + + pr_err("cb7210: gpib_register_driver failed!\n"); + return ret; } =20 static void __exit cb7210_exit_module(void) --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 0F0FA86339 for ; Sat, 28 Dec 2024 06:25:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367157; cv=none; b=bxt0t72usYnK+/et1zidxK1/kUUsuFifUNkYvD4tQNAdFj0LXMP9taLhi8qX4/yjwDO6AIWx7I2xbUBaXQHbUVnrQVIC4crEaNz0SxH9ixZv0jIC6HLBcBAshb0xxZneN2VI+SZ5L281ulkPBi/ocaKmPoPKSmnFKVrnsCxgVQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367157; c=relaxed/simple; bh=DiRa9ccQiQCl1NUp1iOeJ2P/1FNzMtrAQ1t/b/E9lew=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qifd4b6ZGXG1uA+ymutEX8FNgyNwqPoHPs/tz8XC3LkncsVCSPj6YgXnK2JBqJVm+FPfVvtzykrjBmAlp3613M3ZrSOKuq5UsUNI547nOkBSrbIreKhojK/hZR9nfJ9FBHyzETA1r3YiA+TllzFUmo8K/oXszjA6o2QYeH2bme8= 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=M76DsqBu; arc=none smtp.client-ip=209.85.216.51 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="M76DsqBu" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2f45244a81fso1246736a91.1 for ; Fri, 27 Dec 2024 22:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367155; x=1735971955; 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=U1VfslPjbzPmT9c9bSTxnlZCAB7dXV/7Mr2zyjVr3jQ=; b=M76DsqBug0NOfXa+ZiCRc862BvthwuWwLn3NHu5hfZQFz9P/F9WVwf7sQNqcal9tUN MGMUlYcGm1mOmaJchmxuCoHgLFR/C/JRrC+IMFfyoZVlRinNTHQ3GT7KNR+qMuxfBObK 4n2YS/j3GBNJzb044jFj1CPWlP/m7uEcni33Fdzy8hjBWJcV7lKEf8C0UpGh6v5pdjJE 5/onvWfb3uVAUEOCi1yPcLaDN1Z8qRQhzhkdRqGcFsj6IU5RKl6VFbKa6SRsnOQqbCQb zMj42GjEozuvcub083TqoJT7EogjL6kFqsw4Dx7Cdv9qAAS6+CYtv5hqU+2D46qC4RD4 sdgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367155; x=1735971955; 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=U1VfslPjbzPmT9c9bSTxnlZCAB7dXV/7Mr2zyjVr3jQ=; b=XIpGAkCwByi22J1GqGAtv8UL3NiCk+yFGLdzLawycx1BMRHY4Jxht2bHaYUcQTBhlt u0mgMdTnoGpVVDrkb1rpvdMxWUjp9UTfxrlWv1VmVvapI4CVr8/JbQyfQWzdRrjw6Zmi SMK6Pc93ay0nZjfjjoG87E4HfBAoOrXrU10qRWsWzWAFlLS/XrJ8BPFzV0GTE0pOZ4m9 xxNa7owrWnKBwvnjbS95QyZxuJWMB8EWPMXGOW4SEOLC7XtYhqvFAwhrChdl7w+rGuM0 xiBtlv1BpvI5iMwVekcmBpd91VboBgOFpW1wToD/8LPSXU6fRWyQqEfnGKImZnU3U/zT UGTg== X-Forwarded-Encrypted: i=1; AJvYcCU4BA+mgYr1q6hm8I6TMtz9uHvGNL7mkVHD1dDCfS75m5skq9wVCdXSJRnMtXDI3y7CmM5noCCsKFzRjvg=@vger.kernel.org X-Gm-Message-State: AOJu0YwZGsHIDXBfnpQ7AExURCwId1woNiabhpuSL0WCLgjZ0YvfDXpg I84g3xRzsy18UlVbqstsJf062KD5cs0fvSgL7UqZphx4Xyer+s6G X-Gm-Gg: ASbGncsX/m/ONCkn3nSroHAnxVZHWWCrLChXz2ODrl3/Yo9WXvm2vGfJ/CT327HC49O V0p6yL5r1AKKVTIwyVGNBCCvK+25mrbbJ/kHH7YIQJX69wHJ/YBS/CHpefwWtXanSKXvAoQij0F NPO9Rfi1Qw/PKLnr8rSXCLi7Y19GbqWCqYR9JP3xXqLrYdwNaecPSxjWRx1mkHnDfqb237rwvJs 279zNlQx00MWiZJ3CV8lop3jOua66j5v4b+WpKFx8KPgf8zdDqy0jM= X-Google-Smtp-Source: AGHT+IEpBsBBwXgjpkbchPZlyJwMH+ROmQ94Asfaj950k2A6CiGmu5Q0PWz52PGm4iQlubWSeDxc6Q== X-Received: by 2002:a17:902:c408:b0:216:526a:5403 with SMTP id d9443c01a7336-219e6e887dbmr154779935ad.3.1735367155451; Fri, 27 Dec 2024 22:25:55 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:25:55 -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 05/15] staging: gpib: cec: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:53 +0530 Message-Id: <20241228060800.107653-6-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and result in a semi-registered module and does not return an error value if it fails. Unregister the pci registering function in case gpib_register_driver() fails and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/cec/cec_gpib.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/staging/gpib/cec= /cec_gpib.c index 3dc933deb401..5e887c649ddb 100644 --- a/drivers/staging/gpib/cec/cec_gpib.c +++ b/drivers/staging/gpib/cec/cec_gpib.c @@ -365,12 +365,17 @@ static int __init cec_init_module(void) =20 result =3D pci_register_driver(&cec_pci_driver); if (result) { - pr_err("cec_gpib: pci_driver_register failed!\n"); + pr_err("cec_gpib: pci_driver_register failed: error =3D %d\n", result); return result; } =20 - gpib_register_driver(&cec_pci_interface, THIS_MODULE); + result =3D gpib_register_driver(&cec_pci_interface, THIS_MODULE); + if (result) { + pr_err("cec_gpib: gpib_register_driver failed!\n"); + return result; + } =20 + pr_info("cec_gpib: module init is complete\n"); return 0; } =20 --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/g= pib/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) =20 result =3D 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 =3D %d\n", re= sult); return result; } =20 - gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE); - gpib_register_driver(&fluke_interface, THIS_MODULE); + result =3D gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE); + if (result) + goto err_unaccel; =20 - pr_info("fluke_gpib\n"); + result =3D gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE); + if (result) + goto err_hybrid; + + result =3D 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; } =20 static void __exit fluke_exit_module(void) --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 30D95136672 for ; Sat, 28 Dec 2024 06:26:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367162; cv=none; b=ssRaVceoCpD+iktZ7pcSB2RHaOD/fkhFAxn3MNTAMru28JNIvxnpyd/reIzvzj646NVf2uW2+4oWWOnBe/PA5GAVIQ36eeSfy9jNGyBd5/Tjw33WPCUIuqSaX/fJcnekEwzWVvMkefD/T4cwged06u5hbVoLR4V5YGUs5yw+Ouo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367162; c=relaxed/simple; bh=AvE+ZEF1+f7iIqwQfu/zbfsAvnIPkCkHKVLb4bhyW1w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kSuNFqd/Cet9TIs3oVtPh/IINckqaFKxMSBguruyrKKQ+pMrh9B3jDewKbgFltePLTTqfQgo1iqK2v/n/J/OOG7RUfENWmpnIweaDH3j37mcQIpGywBrzCL17nDggjx+ewGNzQIr1yJeHHj+ecDYdmKEVKtop9YWDCB+qS10BUo= 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=Zop7u13R; arc=none smtp.client-ip=209.85.216.47 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="Zop7u13R" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2ee534d6800so1538261a91.2 for ; Fri, 27 Dec 2024 22:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367160; x=1735971960; 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=i10RE9zyD7IP91+uzWcpn5RslSFQwdTnI7L0HSG2m5Q=; b=Zop7u13R0robf0oKsBfdDjcwdsjczCyiYy7PVsNE+pX66y5ekI4JGaQg+JUHe32/1H KmfuwkSHFked9t+j4mDKq5Q44I80Yk9O73gYmpRukoJ13Qn5rx805Pxy1OqiQouMlHXR BYyp09WJxq2bQ4TpS8kvxU47s/xkW1YD2/f2BWgbsjf6emowNu4fY8Uev7Y6WRjkRzey EEr6DPIFalgieWnXMYLtPdQpG3MF1ztGi3+MvlW8VflyqY2XYlmJbcvnkIPjDqxalUZ2 suQnaSpJ96ee/3zzTQ/wxUA7TqPfIE8Uyk+OV27FXS5noUUCcDabz6G48/bFM8PoDgWt gXsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367160; x=1735971960; 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=i10RE9zyD7IP91+uzWcpn5RslSFQwdTnI7L0HSG2m5Q=; b=iFLrBQl6iDSv8rJnVO3qq7zphPjhrtN7bG4zDaBXtII3pH7JFt1P9kdDqEwDZ9yqCh WIHpO/ck/1IrJCYAaCg18cC3ND5tz9cYq+fGAzrblwITtjhvMYChVid2KLANqEtab6tu 9olod9m2vUbIukC83OrqIWZY2SbJhapmEisfl7y67UAn28Uii5mtjQc0N3GLRZccPq3F ZVXS12BOCEd3bWojwAexGAbzAQQPySGWIuwFuHm2JGjhCLdZkhzCLh9JbcJFaimCQMVF XeSqi87SPEoHUZloIgROcDl0IbSiqMDbArrwA7OcRwSjo5ncXbTxjXFPOGShboVTNuTX 6qyw== X-Forwarded-Encrypted: i=1; AJvYcCXrZvsEQqTAWNoCkkxakbxJSNote6WQWMTEy8NQOQBUYk7v0lHRyquRI+s6QrkdqCk/I+84RvLsB67/R5w=@vger.kernel.org X-Gm-Message-State: AOJu0YyQ+2whAcz1FOrhBHQgqVr1+/6zSYVozQd4ZnLPv55+C37VV9z/ bnbaUnEN6CBLIoXc0vX/wlsRlSl1mgJkCZ40Do7W8QjwDiLSdgz+ X-Gm-Gg: ASbGncsax3HEKbJN3S8hIGE0dP8r9ZhvjbsbhY1XQuO8ecHCaBv9eBkMk+qr1u9yZ4C J6IwSKzYM9MLX0JbTPy0KXPzbydTi1E/IweRfCfajf32nxQUrihcjjEiELib/of2d5JW2VNDhvd cu5P8SSDnx7luTeFSXS8upVyhiHL44g/T58xkMNqbeDuLB5OJPReC98dNUSX3j/ewYa+mdQvIco JhN53moPlD7KnusOQNZRRF9rsu3Ali0kSsj4ZfJTQbfPRrm2nDJKfk= X-Google-Smtp-Source: AGHT+IEy/vLKr5CPV9VdQQEIwlzat6XJdWEUeFpDUgNsbgZcgmg+P4UVkPQNt+X6+/m7hOupwakBLA== X-Received: by 2002:a17:902:f542:b0:215:b8b6:d2c4 with SMTP id d9443c01a7336-219e6e9a23amr150460235ad.4.1735367160439; Fri, 27 Dec 2024 22:26:00 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:00 -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 07/15] staging: gpib: fmh: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:55 +0530 Message-Id: <20241228060800.107653-8-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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, pci and gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 41 +++++++++++++++++++----- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpi= b/fmh_gpib/fmh_gpib.c index 62791db1c34a..dbade677391b 100644 --- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c +++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c @@ -1691,23 +1691,48 @@ static int __init fmh_gpib_init_module(void) =20 result =3D platform_driver_register(&fmh_gpib_platform_driver); if (result) { - pr_err("fmh_gpib: platform_driver_register failed!\n"); + pr_err("fmh_gpib: platform_driver_register failed: error =3D %d\n", resu= lt); return result; } =20 result =3D pci_register_driver(&fmh_gpib_pci_driver); if (result) { - pr_err("fmh_gpib: pci_driver_register failed!\n"); - return result; + pr_err("fmh_gpib: pci_register_driver failed: error =3D %d\n", result); + goto err_pci_driver; } =20 - gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MODULE); - gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE); + result =3D gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE); + if (result) + goto err_unaccel; + + result =3D gpib_register_driver(&fmh_gpib_interface, THIS_MODULE); + if (result) + goto err_interface; + + result =3D gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MOD= ULE); + if (result) + goto err_pci_unaccel; =20 - pr_info("fmh_gpib\n"); + result =3D gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE); + if (result) + goto err_pci; + + pr_info("fmh_gpib: module init is complete\n"); return 0; + +err_pci: + gpib_unregister_driver(&fmh_gpib_pci_unaccel_interface); +err_pci_unaccel: + gpib_unregister_driver(&fmh_gpib_interface); +err_interface: + gpib_unregister_driver(&fmh_gpib_unaccel_interface); +err_unaccel: + pci_unregister_driver(&fmh_gpib_pci_driver); +err_pci_driver: + platform_driver_unregister(&fmh_gpib_platform_driver); + + pr_err("fmh_gpib: gpib_register_driver failed\n"); + return result; } =20 static void __exit fmh_gpib_exit_module(void) --=20 2.34.1 From nobody Sun May 10 07:13:32 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 98E4A13BAF1 for ; Sat, 28 Dec 2024 06:26:03 +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=1735367165; cv=none; b=EjkKPVc3Wg4RUViGj9ouEQ1OHtF7wVchGVI9cm4NRHQbnhTYug0wxl0/jCLdYxLDsJQNYU9hFN0qxpfHduPU7m+GUYvyBv2mrTaJbnHKSobGaaL984bcLf82jpbGwlNhfa6qZk2olNueqRioXVRYFhD/PlqLZffXNJVBRLpNr/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367165; c=relaxed/simple; bh=pyOPVCmKVw5hJ1elcW8WlGFsIQjVG+F19Ncu6OrPZoI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rmSLpidb3JIglhG5GK0SPn5Abi5v0PoJPNXmIoA/tRVUprp8sGPu3z0VYz73eJnSsrUo3g0x89jJ1ooEIEtj89ioWDgTkw3MlCPXL3TMb169jKyCuA0miDEHIQ1ksSBeyrLTCpiC+kOgObHwLN+DHAmM0uFWrapL4tReKg6eDOE= 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=R86aVJc2; 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="R86aVJc2" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-216325f516fso10044215ad.3 for ; Fri, 27 Dec 2024 22:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367163; x=1735971963; 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=2BGixoehf1mJw23JkUWifJrsL6wsfFdC9e2kfI8fNrs=; b=R86aVJc28An2TNAubt1s1+sZBmxhEQN2r+7v+1r8zQVDyGyCE3hxsS2zWrjnNHVStx EKWs3kjC2flUVgPFgxC0Ks0wfyrkh1eOWjMy4pOkMLIElnjv75b7ILFNlmg2TAisxv5z hd2BZvDZbFKRTFjvhCbivPxYHCfUZ+YSt6ho5FsIBh63fd8GbUAFEEN/F0l+NGE91T/K V7O08BkV7PpfcxtBoprkw3HFQughBkKyQrFbwZ8k2k0RQEyZ552VN3z5bZs3CS7E0Drc CzfNMJyn8sEFtAMgH7CWP4eUrGvjiXhRr/fYkxayjOYRiLUCL8DRal7O6RSXAPjFS/bZ J1NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367163; x=1735971963; 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=2BGixoehf1mJw23JkUWifJrsL6wsfFdC9e2kfI8fNrs=; b=pMVYuYz3dlw/rC33eWe0NUmP+szFMh7SCO/junFM0eqGuqQKtGvd2TMKKRNUtatNGl NOct3e95ZKcg0DeiBD3w4ehNS7c4zZbxgfHdn9qAoB9wGItLORvV8wdH8TNmcFgU6Cne ++Q1iaHUhw+Wiu/ZJuKQjAQIFq7ZE8RPAQ03IJGmTczkqc92srwFcGnkHauiavR9LzyT w+XVEYhj/kX1SNq++wnW/1KU12tVyUyGXuZs5lcSaiAdLDfAVjUIt87YsCKphVV/Rh4o nCsjV5ja/H857V4nnAW+pUEsT2V6Rq7Ou0/gX45tqVO+1Zp9nNroSppZc8cyeVedhzLC /riA== X-Forwarded-Encrypted: i=1; AJvYcCW43CXRmTmfOXZRJhkTuuQEoUuNjPBDYcduUrDNzVQ20DrstHfN97LsW4tX0NgtkMY2rZvm4ibOp/5baYM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+FNiaJmmCEgINk133gZvJfWNTQa37bqK1sJPRya94toc6ArM+ oqHWSKfe8XlBLBhIkX5wFf+j7Em0MVoeS+42OBHsUcvOLsXyj0IxJotCxbPO X-Gm-Gg: ASbGncvcdJsld3vjMnEmIE4JyP1OGqgR1vpyGha6QXMO3CSwpcwFf/xVUxpsHNAMkJj rCSL98wT273ravSgdd/E6Yi4d5kUeAP/YO0Vi3ZXK+NtD3AATc8wZmkCi+9yV8+gcpv19U4mtST So6Q5UuO9Cc7YpAFFzWbv/+CDAvqe3QL4J9YRI+bn4MfXWu3MvH+NgxbItIcvrEKunS4e4d8nxp kNs3b3RsoqsIkxCIoU+vcccyw9Gj03Sm2ti7fRIF4LgAkf8wxetufw= X-Google-Smtp-Source: AGHT+IFWfnKofbkMu08XhiPNmXkh7Z5P7w++dePA8aFkTeINdP0r6SyQwZiVbqnBsNrkbLIWSSeBEA== X-Received: by 2002:a17:902:f541:b0:215:98e7:995 with SMTP id d9443c01a7336-219e6f117e8mr158070925ad.12.1735367162925; Fri, 27 Dec 2024 22:26:02 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:02 -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 08/15] staging: gpib: gpio: Return error value from gpib_register_driver() Date: Sat, 28 Dec 2024 11:37:56 +0530 Message-Id: <20241228060800.107653-9-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and does not return an error value if it fails. Return the error value if gpib_register_driver() fails. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/gpio/gpib_bitbang.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpi= b/gpio/gpib_bitbang.c index a2d562cbd65b..0fb654757540 100644 --- a/drivers/staging/gpib/gpio/gpib_bitbang.c +++ b/drivers/staging/gpib/gpio/gpib_bitbang.c @@ -1341,7 +1341,12 @@ return_to_local : bb_return_to_local, =20 static int __init bb_init_module(void) { - gpib_register_driver(&bb_interface, THIS_MODULE); + int result =3D gpib_register_driver(&bb_interface, THIS_MODULE); + + if (result) { + pr_err("gpib_bitbang: gpib_register_driver failed\n"); + return result; + } =20 dbg_printk(0, "module loaded with pin map \"%s\"%s\n", pin_map, (sn7516x_used) ? " and SN7516x driver support" : ""); --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 1E6F27405A for ; Sat, 28 Dec 2024 06:26:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367167; cv=none; b=Rxh2mnN5RQDm7k5Oj4wvlg3RF+ZHhVSScDUSj5OWNAZd0OWHWUMo3q4FfxbKoTqg4y+nF2CpJw81UkDVlEP4iel0VJb3zqq0F6S9VBKt65g96FvsiC+qwf6bW2DgPr0lc1kdrSptJFet2L3qT2taR3XHXnQqPxBShhbW+ZBYQLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367167; c=relaxed/simple; bh=Xkj3OhYt0HsoR7LS8r60bpO4lP0pmIMbSAM1dLoqnkI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kwNJ0rBmXWCR82ZKt+SMmsoS0be145dsC2MjN1SE8zINpdy3QTqkRBWS9WrTED/bDMlMV7FOAeQsBZos8nIQTJeNWKsERxr3jclKftRoan2vXEC6JZ3kuVJowF8HY/vonDXH2K69QbyA2j/qQiVHUK29fFTUfwGk16FEW6Gbi3Q= 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=naWD/K2V; arc=none smtp.client-ip=209.85.214.177 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="naWD/K2V" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2162699e0ccso11252975ad.0 for ; Fri, 27 Dec 2024 22:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367165; x=1735971965; 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=Bu+fa23bR/zX4SKFUNVb2wSGAsaVSctXfIzv3zCZzfM=; b=naWD/K2VcND9oVJijIL4+WQklDWTHbZxN8b3CCVJr3+8SgTP/zrEw1fJDp0UBEpinG WGnpKhzDCwJGOYE8l0B2umW/0gO36oRdpkigcDcPEckMTlWbtcRxLerRFOUgUazUAlrt VzAVKPR0fQiUOHREOMmmIwW360QYrppGeP753rg5mwD7CnJkXtivapSusv9BX1NyTWG2 CBlt1PiJeRLNzj+fWZz0OpOCpqNmQlsRucrcZb8PHfMxGxzmwaaUR3UGs7NsiQCdTdDI lUORzi6iXgMZp+32BMxkyVBuIIB6b6lib1jHftfFv/1kS2YVVcCpCJ87BJ/hU193Lygr b/Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367165; x=1735971965; 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=Bu+fa23bR/zX4SKFUNVb2wSGAsaVSctXfIzv3zCZzfM=; b=iRM42/DKr7FW0CQdt54vNOD6JyrYJx8gopg4fC0ZRUnLLo9VSWBIq2VX0ozHGXb0hs iseonxL2/hT4VaoPkhNtH4lYiDmLFl5OYPE88t52PqTRgrv0ZWRaV893LQwKhgVhsYdR GNrJ2L/YkeLTyVW6XmcnsEP7IJp19G+mZiM5jX4lDqT8iKcghaG8AUpzTF1/Gewb9reS 8lb6yzFMa4IY+S4heRy0br5RCEFXrm+Eye3bfcT3iIp19DnOLaA/JBUUhp2ihznpriNd 2X2Ky3sz1Y/lDLBTxPrGWXpOnpaEUuMbEl2/faeFlIUQ+7R/G19mZJOWRAoaFkefZ3CM DeFw== X-Forwarded-Encrypted: i=1; AJvYcCUGH9Ubizw+/YbRxBSah3B9IaBZu0uM1P3k+Vu2nVC8Q6U1u/mnu8IJLnRCAwiGBQnduowDNBDueE5WaGo=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2TyzEq9hv79sFcqfiQCz/muKfxqJu7jMGxcQLA+mqu4j5kEHa Ji3mds9bwWki0Kqdigmb3aOqkrhvtwPh/sAjsHvsb6GzLc5ZkAlU7UUg/M1K X-Gm-Gg: ASbGncsh599+IxHRPNRXL7QNGjIcyHChpacpwT2yYz7/JHeYGYQNBV/ujK/5zQw9IdK 5mxMALS6ZVHTHkjRJTIsHFgbh5sMQjtNViA2onvcmtWoyhsiE5tkMRnlTv9xX0qzeHgKAA/lp/D AiJ+SSJBltI5BbHWq22CIl0VdoA1x85EijVUKBBZEmk532Q2RuXQciOZQlL4ZoK5dDDTidl8miA yl/HOJQ7Xdfn75ytXYHnyvcGBAYDrgnAG/UzkwklCj/fsaUnDnY64A= X-Google-Smtp-Source: AGHT+IFvF6NazmgBMZtn6N3YueQInbnzxTDwbrKgIMEWlCqAUdHFmci1WI98dcBWquRlmr4b9CpDCg== X-Received: by 2002:a17:903:2345:b0:215:435d:b41a with SMTP id d9443c01a7336-219e6e857b8mr150776455ad.1.1735367165378; Fri, 27 Dec 2024 22:26:05 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:05 -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 09/15] staging: gpib: hp_82335: Return error value from gpib_register_driver() Date: Sat, 28 Dec 2024 11:37:57 +0530 Message-Id: <20241228060800.107653-10-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and does not return an error value if it fails. Return the error value if gpib_register_driver() fails. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/hp_82335/hp82335.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/staging/gpib= /hp_82335/hp82335.c index 40afe42aea47..af8ddc173d12 100644 --- a/drivers/staging/gpib/hp_82335/hp82335.c +++ b/drivers/staging/gpib/hp_82335/hp82335.c @@ -325,7 +325,14 @@ void hp82335_detach(gpib_board_t *board) =20 static int __init hp82335_init_module(void) { - gpib_register_driver(&hp82335_interface, THIS_MODULE); + int result =3D gpib_register_driver(&hp82335_interface, THIS_MODULE); + + if (result) { + pr_err("hp82335: gpib_register_driver failed!\n"); + return result; + } + + pr_info("hp82335: module init is complete\n"); return 0; } =20 --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/gpi= b/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); =20 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 =3D gpib_register_driver(&hp_82341_unaccel_interface, THIS_MODULE); + if (ret) { + pr_err("hp_82341: gpib_register_driver failed!\n"); + return ret; + } + + ret =3D 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; } =20 --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 075CD15442C for ; Sat, 28 Dec 2024 06:26:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367172; cv=none; b=m2deEkPJaYorNP3cyzFk7V6zg5DJk6dHOkJU0dwdAaV+vb7qQ+LYq2pyRqoEVpjLGy3ok/04UVkgzYHRWm7xgrlRXnrH3w6XutPm94olD7ICP5jKkv7e37ceqj+Bebt7nEfqrGDkP7puaB+CIqgRp88vxvjHQKi4Ek7s0iin55w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367172; c=relaxed/simple; bh=JOHR5VlRenADrfDOxP16ORU/YMBRx7TeGBJA9vYht4g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XDBroOjEUtz+WHKOOhU1WpJQDfYRBaxKb83q+DNVOn7QK2IWBtCPnq78TrZJnW92qbYa+lEjeCMrks7/DBNbcfi8uA1cAvKvFvUgaYLp+6HGU/7idSesNGuABxv/8QHN5JSjTO2yttVJSnxLqEyjDoEKUg8W6Zmuw3Vc/dM4aJk= 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=S6CDufyK; arc=none smtp.client-ip=209.85.216.46 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="S6CDufyK" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2ef6edddf70so1327866a91.2 for ; Fri, 27 Dec 2024 22:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367170; x=1735971970; 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=2Lg9KnA57E9rL6FhvSGYf0hFwAPesmNxIwcx8PKMHC8=; b=S6CDufyKO74FFTVwGi24icAjhIUkSAAxadT/SYFf62+BAlqVz4JkyDXBd81e8dX0vu 31fz+umaquk5tmiHmmhCN7c4o9g1xvYzjaRAWlOqoVG+azKzKKoOUREPtqh6vjJZP13A 9jS5MdLkROdWdfYE6jkBw/pUkNL3ppiMI1s79F1LVbS5tcXQoc9WcmAmK8r8S0LM5mIK UWNnCwSryGQsnpiVbsGsG3qLPVS+qyf2RrpRcVibpcjzdOypy9LXFjsAdLtjDxsr8S8u TNXy1heX9pitlc9MTOiSBHBUwf0EPOKAt3AyAKboZJ+AU8C40Mn/96nBdUaYzaYa3hRE ChnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367170; x=1735971970; 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=2Lg9KnA57E9rL6FhvSGYf0hFwAPesmNxIwcx8PKMHC8=; b=rAzntnxRjD2jin3XYM55TfVdDxQgHGdQSmGlkVxYMW7zMq0Ctly35pxCPdLHlCUb59 jf2hzv6KrbxjhDWo7nciOsjZ1LYxEZyc0qy5bcmedhHbDXhygpyEwYCKAGPQaFXgzF2i 90P/M5B3so61yx/1ZgrH/BZNDZCWJ+sDgqTafMGLu4yJebJJUpoYnpW4u0RXlGmcprSY KfbnG48qPvFzFf/B1zi13VeeBCGGHdjFrNrQ/UuIMwoa1sSkfpD5sTklxRZSmdg4nF+t FslAko+Weage8rx1DNQkv9cpSxmrxBvTekltZ3YVxmhnlHuUbB7V8FQwTz3MOwxjZd37 rUVw== X-Forwarded-Encrypted: i=1; AJvYcCXkmJcyk+ihIyKNTIVwI4NP0T85/KtgHJSF0SjvaSqNcAd5uSdXj2BKxNwodPU2KfkDZA6Svz9SQ2VynNU=@vger.kernel.org X-Gm-Message-State: AOJu0YwybjlSa0+/gh5iD0yUuqI2kXe/aEKFKDxcfdaq9erRQ93muq0p 9HBTy4Qfxmtvd7Eu+3CXFquC8y6immJrl6WrGikhjm+luPMM3qdr X-Gm-Gg: ASbGncsyDyvjRaqq86Rjxis8gYA9d+Spqo5NKSIU/0Ur0JtpckJveGQ/PKBK3/2RDJL Qg8MpbjjrxFkczjXJXn8IaTLcGh72Z/zx+q2zvCpqKTfmbmVe2hO2gxFGDDoBS1EUHojbnyz5gI XVoBsCXvN+zUeILUmO1ZsX7Fhyr2UyRMT5Urwm7xsx/hzuh7kqVYKqaSUw0zgKn5KyI4lsfdDJI +BE36gDKl+IElYVYYN029dxpqGDuZ02XEZSI+g1BB9im8H8MSszyu0= X-Google-Smtp-Source: AGHT+IF/QYTqVgHWD4K3RQ9tT8uBym61yV0x80BreLEu4eZVJEZeEPyv7J70tBFrC3fF60LDk2Z6jQ== X-Received: by 2002:a17:90a:e18c:b0:2ea:5e0c:2844 with SMTP id 98e67ed59e1d1-2f452eac13fmr16865448a91.5.1735367170370; Fri, 27 Dec 2024 22:26:10 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:10 -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 11/15] staging: gpib: ines: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:37:59 +0530 Message-Id: <20241228060800.107653-12-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function ines_pcmcia_init_module() can be replaced by calling pcmcia_register_driver() directly. The error value from this function is not returned and the previous registering functions are not unregistered. The function gpib_register_driver() can fail and similar to pcmcia_register_driver() function failing, the previous registering functions are not unregistered. Replace cb_pcmcia_init_module() with pcmcia_register_driver(). Unregister the gpib and pci register functions if the subsequent gpib or pcmcia register functions fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/ines/ines_gpib.c | 81 ++++++++++++++++++++------- 1 file changed, 60 insertions(+), 21 deletions(-) diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/i= nes/ines_gpib.c index 9d8387c3bf01..73df4cd16926 100644 --- a/drivers/staging/gpib/ines/ines_gpib.c +++ b/drivers/staging/gpib/ines/ines_gpib.c @@ -1227,12 +1227,6 @@ static struct pcmcia_driver ines_gpib_cs_driver =3D { .resume =3D ines_gpib_resume, }; =20 -int ines_pcmcia_init_module(void) -{ - pcmcia_register_driver(&ines_gpib_cs_driver); - return 0; -} - void ines_pcmcia_cleanup_module(void) { DEBUG(0, "ines_cs: unloading\n"); @@ -1420,28 +1414,73 @@ void ines_pcmcia_detach(gpib_board_t *board) =20 static int __init ines_init_module(void) { - int err =3D 0; + int ret; =20 - err =3D pci_register_driver(&ines_pci_driver); - if (err) { - pr_err("ines_gpib: pci_driver_register failed!\n"); - return err; + ret =3D pci_register_driver(&ines_pci_driver); + if (ret) { + pr_err("ines_gpib: pci_driver_register failed: error =3D %d\n", ret); + return ret; } =20 - gpib_register_driver(&ines_pci_interface, THIS_MODULE); - gpib_register_driver(&ines_pci_unaccel_interface, THIS_MODULE); - gpib_register_driver(&ines_pci_accel_interface, THIS_MODULE); - gpib_register_driver(&ines_isa_interface, THIS_MODULE); + ret =3D gpib_register_driver(&ines_pci_interface, THIS_MODULE); + if (ret) + goto err_pci; + + ret =3D gpib_register_driver(&ines_pci_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pci_unaccel; + + ret =3D gpib_register_driver(&ines_pci_accel_interface, THIS_MODULE); + if (ret) + goto err_pci_accel; + + ret =3D gpib_register_driver(&ines_isa_interface, THIS_MODULE); + if (ret) + goto err_isa; + #ifdef GPIB_PCMCIA - gpib_register_driver(&ines_pcmcia_interface, THIS_MODULE); - gpib_register_driver(&ines_pcmcia_unaccel_interface, THIS_MODULE); - gpib_register_driver(&ines_pcmcia_accel_interface, THIS_MODULE); - err +=3D ines_pcmcia_init_module(); + ret =3D gpib_register_driver(&ines_pcmcia_interface, THIS_MODULE); + if (ret) + goto err_pcmcia; + + ret =3D gpib_register_driver(&ines_pcmcia_unaccel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_unaccel; + + ret =3D gpib_register_driver(&ines_pcmcia_accel_interface, THIS_MODULE); + if (ret) + goto err_pcmcia_accel; + + ret =3D pcmcia_register_driver(&ines_gpib_cs_driver); + if (ret) + goto err_pcmcia_driver; #endif - if (err) - return -1; =20 + pr_info("ines_gpib: module init is complete\n"); return 0; + +#ifdef GPIB_PCMCIA +err_pcmcia_driver: + pr_err("ines_gpib: pcmcia_register_driver failed: error =3D %d\n", ret); + gpib_unregister_driver(&ines_pcmcia_accel_interface); +err_pcmcia_accel: + gpib_unregister_driver(&ines_pcmcia_unaccel_interface); +err_pcmcia_unaccel: + gpib_unregister_driver(&ines_pcmcia_interface); +err_pcmcia: +#endif + gpib_unregister_driver(&ines_isa_interface); +err_isa: + gpib_unregister_driver(&ines_pci_accel_interface); +err_pci_accel: + gpib_unregister_driver(&ines_pci_unaccel_interface); +err_pci_unaccel: + gpib_unregister_driver(&ines_pci_interface); +err_pci: + pci_unregister_driver(&ines_pci_driver); + + pr_err("ines_gpib: gpib_register_driver failed!\n"); + return ret; } =20 static void __exit ines_exit_module(void) --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 7A97E15665C for ; Sat, 28 Dec 2024 06:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367175; cv=none; b=pLrWR9piBFwSRfMd2l1enjlexxOtSDIExZPZXX0w2Kv3Y5/jbZDQWn5ZPewE8LSc98j8KXp5j8wD1CVhTBFlSq67Jui5flDkyOMue/Mk77NdNLsgBa9/rMnQUcZgS4VVr1eDDZtfQYcQSzM+nkquyfFf0eXE08RgmAn515frUSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367175; c=relaxed/simple; bh=lr1AwV+7ytQ+p13PvcJ10i/P67gCpy/yiNxZKQ3zv2E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ni5DO/Mngurrq5oxnRJbGlCRSYvMxwa79X5ESs3Kv+QUCy3r7YTeYR0QtDDv46xwjEB2wG/r1LA+fxbAndTyCLMRNqaqcrQhS7CNW1h8tgftXTtf/cFuJy9tr7AzC9RlV7TiAIsIPLGPqgF5xQyJwAc6z4fFhK7pORgZY+W07JA= 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=RF/7uHht; arc=none smtp.client-ip=209.85.216.42 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="RF/7uHht" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2ee8ecb721dso1544740a91.3 for ; Fri, 27 Dec 2024 22:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367173; x=1735971973; 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=jqyLbhN32nQLTtGJ7VORBdyPFF/pEaWIZ7FPx+DyLKc=; b=RF/7uHhteC6M/fKHhfswAxg3Ad9OgUYOM6LfNDwp7yT9Hln70PGwfbtxew1LPOCCmL RFBVz6J/ucNlObYu1qaL53XBksX0tXc/brftORG28SyFSKaGepBxS9XekSAyXt0AWp41 gB98e2kzDOWyj0BeSco+F7yaoC0bDHmZcBZ6XiK374QUun9p+aLwjScIH2qgLUlIqjJF 2fMwjhD7/qeIxeM2vLuo6oXozcKWBnI6z25iNPCqa4zaTNolwxQvG3mh0f7oQbM31VE7 MpdkffY7e4SUIalrI3W0HTz6ZnerM4fLbN3ZNWvzhoT2fQkCLdxMzs5K0/6WGisu99Wh 7ivg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367173; x=1735971973; 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=jqyLbhN32nQLTtGJ7VORBdyPFF/pEaWIZ7FPx+DyLKc=; b=VvJzeZg5nj5wLYB8u+V6h4n9Xi1l/R+0aD2ZPrNK38ytu3/SBQYl8fPM7Ms60YR/xd 8njcLzZP+HKwxuktd6nhJX8WzL7zxfzbOz/mfCF96S5d58eQUe/05iiGOTv0x9XBBc9r KVfqYS5KOdW2j9d4VSwtSsF4+awV2jZqP+MIj8vigA213Dn6HESBqXxscLXuk3D6Pz8i 3B8f3i5vdhXego4RVYYtkwANHOvYNF5mpwaGeMXSVGHaVv00Argin05WfysB3ff5+BFg 0ua9DmrjPQvp67bosEPWRTSQZj9C16KnkNgiC6SQTdmzX6wP00YszLWdEt0PlWlmn3b5 6jmg== X-Forwarded-Encrypted: i=1; AJvYcCU7mViaoVa7OmyYOstn9gPquWtusmdz1vEloidDtjTkDD5uLGZRX3uY6TSlszvwbHmt9zxG9XpNWm4fVek=@vger.kernel.org X-Gm-Message-State: AOJu0YyuUnmPepeHKVIuKCLEBqR2pKCfIavgkZ0Wcx7cRmUNryDq5AUZ IMz0h0sYyPgqNQ0EG/54Cxo6gOJg9d4qiBYRB6FOKPxOTr7owrSo X-Gm-Gg: ASbGncv6el5dhYaCmQEtobVN+nx59OOkBU38whdpXHVkpVCEiv42NDNg4Zs4i+6j/PZ inRVGKPv52pJ+OMH9YnYa9Zqr57jNpZIZpWWk1zrK5TYfr6lFuYP187ec8NpHVZLHR2NhblIDRJ YaZQtCz2Gw6jlxxWK553N0iHzv7yxAor7U00K+j2/svJG5LRekkMwhO6w6j4ONbIpmBkzlyuL42 fIlmZS+MoUOLktoGDI+9Rbq7/53AfJdfxP7aPJiQoB/P0bJOyrERAs= X-Google-Smtp-Source: AGHT+IEIE8ByWvqP1tW47xaUPQySLKKN79YMSCGqMjqOaa9ryA4Thj/5iuLHj+xqUYu9x6pwfCtEYQ== X-Received: by 2002:a17:90b:2cc7:b0:2ef:93:154e with SMTP id 98e67ed59e1d1-2f452eac183mr16440875a91.5.1735367172856; Fri, 27 Dec 2024 22:26:12 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:12 -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 12/15] staging: gpib: lpvo_usb: Return error value from gpib_register_driver() Date: Sat, 28 Dec 2024 11:38:00 +0530 Message-Id: <20241228060800.107653-13-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: quoted-printable Content-Type: text/plain; charset="utf-8" The function gpib_register_driver() can fail and does not return an error value if it fails. Return the error value if gpib_register_driver() fails. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/s= taging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c index 796c3a5be545..839e89615214 100644 --- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c +++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c @@ -1181,7 +1181,11 @@ static int usb_gpib_init_module(struct usb_interface= *interface) return rv; =20 if (!assigned_usb_minors) { - gpib_register_driver(&usb_gpib_interface, THIS_MODULE); + rv =3D gpib_register_driver(&usb_gpib_interface, THIS_MODULE); + if (rv) { + pr_err("lpvo_usb_gpib: gpib_register_driver failed\n"); + goto exit; + } } else { /* check if minor is already registered - maybe useless, but if * it happens the code is inconsistent somewhere --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 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: 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 | 17 ++++++++++++++--- 1 file changed, 14 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..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 =3D { static int __init ni_usb_init_module(void) { int i; + int ret; =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 + ret =3D usb_register(&ni_usb_bus_driver); + if (ret) { + pr_err("ni_usb_gpib: usb_register failed: error =3D %d\n", ret); + return ret; + } + + ret =3D 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; } =20 --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 7FAE6158868 for ; Sat, 28 Dec 2024 06:26:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367181; cv=none; b=FOxm7jNG/covaM9hdNs6Yp2awtwgj5PDWhiO4FWQhepyWUXRzK4S5VyOCNF2gu2+b5jgDJqiHCjLwOcp9fp8D32ZcvixIWXEiuS0H0nPp8pRTsdZRGWKwuJOzTgH5hLBKCbuJ/EPM0qbLOlIlu7wxSOFffCmmNjXvoiTrs2utnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367181; c=relaxed/simple; bh=XgIP7ydbSSF1qKIvGtwIuD4MnhazIW69u73z/eHeulw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=egYJuaBd8PRonDF/9Tfmi+/h4nh+xEQUJxYPo27GNH9aIYCJT+hkKdBpW7aL1Ds6OeUwAEGZYyuKgdqpwf58uR2N/j3OLvyOHD9HbrrFvisFSV2c3fFi+17ROZ2fAFDxsnZ0r43TwIrgCOdnSa6QUTicdiEGCJIGJ7+pmfKPboo= 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=mj3PBQ3L; arc=none smtp.client-ip=209.85.216.49 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="mj3PBQ3L" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2f45244a81fso1246783a91.1 for ; Fri, 27 Dec 2024 22:26:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367178; x=1735971978; 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=RV2xfTJdjm2bzq9KK7gXgoeX/vt6XGKV0XWnfw/XSUg=; b=mj3PBQ3LHTZIOTSq8GypxMcxz+gyWsYxeCqjp33DwgOJLhPWKbQ6lT796Ect6ordti 9i7LlZEtXWKDeUsA0MWZ0RN9UneRMoiSi9wTRo1iSd0Qg5hlaESEn385UgZlFeyfK9Zu zPlDYKWqfXPZLV7M/DNQzCtQR4zxuUfNdEQNdnm3OwYWQOL7lG3lJmafab93dePS3jQM gnBtLDPHWokaD10SimR2AhOESAM3W6Zkix+ZNTJ6/noqH+Ahoum68/fh/0OGtmUW+gwX p+jzQ6jU9n3enj0I96tB8aruEeV5fH39f438jNa3WYdTTrDk7Ss9zLZgEPKdhAf6zSsx QVwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367178; x=1735971978; 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=RV2xfTJdjm2bzq9KK7gXgoeX/vt6XGKV0XWnfw/XSUg=; b=O/BrJZWfRaInCvGcYE3W5jPyBJ6698RbgAhklyt3xsCagGQWTVvXQX2dYpELMxx7X6 55tOI1CCkG5TfSttoat9lwbURMSCvo7eVyjVvdpPkjQkDeh6cguVlCLL/57Q2XBCyq0C acA0vsVXhTxv9gI7LLUST0WRlZsWfH/cZZLPl5LXJk4drPnYzSZPsd3+IjLFOds9CQoi 5z/rFhsYVvR68e0ZVZ8rgKVrI9SJtj/XjjXl1Z3i1BgKM1/5760Ea30eWFWg/cbU3xmz gPLNOEe+MN5pzFzVA0KBqkQF/mlP2y/KKxPutGdgufQfQmKKF/n7X90ZneDZSSlDLkjV 7TlA== X-Forwarded-Encrypted: i=1; AJvYcCXuCczZG6I4EDRfRAQAq34HvPhgtOxFUMGaVBoRXJ9xqyRBJPbHcae5LySvKORPEQpwNEgTnnDdb+KC2QE=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0PACgEfwvKJcLWs0JI2XC+/LQX1ZNfGvsmRdOw0PVxMbS/Apr lCYbziQi8pslbLqRHimfO9u91DEzUVW4Wtk7L0XMD9+rxfbXPYun X-Gm-Gg: ASbGncvfpiPnjYiLiV1EviuK1QjGn25g7gfhEu9Tg63eQqmJx4ZP0xfHk/it5DAMotX 7DuwDz/veYQ+IEnbR3EBOg98eS7hFDdpo2GKTXeSOEGtVPduexHeYd7fGELfd6+tQO9KuGcNsUO l/BL9V+cjMcPj2Lrpb5iSDop+N5hUfShdMgGIMICy5yQ2JKnJp3Pnl8Sv2bW2fy7OmE1h8gHLbl lbg4R8P0yHZh2JDu0ggog9VQWXzdh3Dbya8WqjAdAQU8n/bPMH0+4s= X-Google-Smtp-Source: AGHT+IG3Y3OdDd1e6JZB0O8cIIzEcIgy1+yiVFKk94rFCnG7GYGL0L5YQpdSR4NKOq1eERWh8aax2w== X-Received: by 2002:a17:902:e750:b0:216:32b6:cf0f with SMTP id d9443c01a7336-219e6f108ebmr162603095ad.12.1735367177843; Fri, 27 Dec 2024 22:26:17 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:17 -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 14/15] staging: gpib: pc2: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:38:02 +0530 Message-Id: <20241228060800.107653-15-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 gpib registering functions if subsequent gpib_register_driver() fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/pc2/pc2_gpib.c | 34 +++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/staging/gpib/pc2= /pc2_gpib.c index 7b3b34f47341..4441939265e4 100644 --- a/drivers/staging/gpib/pc2/pc2_gpib.c +++ b/drivers/staging/gpib/pc2/pc2_gpib.c @@ -635,12 +635,38 @@ void pc2_2a_detach(gpib_board_t *board) =20 static int __init pc2_init_module(void) { - gpib_register_driver(&pc2_interface, THIS_MODULE); - gpib_register_driver(&pc2a_interface, THIS_MODULE); - gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); - gpib_register_driver(&pc2_2a_interface, THIS_MODULE); + int ret; =20 + ret =3D gpib_register_driver(&pc2_interface, THIS_MODULE); + if (ret) { + pr_err("pc2_gpib: gpib_register_driver failed!\n"); + return ret; + } + + ret =3D gpib_register_driver(&pc2a_interface, THIS_MODULE); + if (ret) + goto err_pc2a; + + ret =3D gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); + if (ret) + goto err_cb7210; + + ret =3D gpib_register_driver(&pc2_2a_interface, THIS_MODULE); + if (ret) + goto err_pc2_2a; + + pr_info("pc2_gpib: module init is complete\n"); return 0; + +err_pc2_2a: + gpib_unregister_driver(&pc2a_cb7210_interface); +err_cb7210: + gpib_unregister_driver(&pc2a_interface); +err_pc2a: + gpib_unregister_driver(&pc2_interface); + + pr_err("pc2gpib: gpib_register_driver failed!\n"); + return ret; } =20 static void __exit pc2_exit_module(void) --=20 2.34.1 From nobody Sun May 10 07:13:32 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 53D34156C6F for ; Sat, 28 Dec 2024 06:26:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367182; cv=none; b=UwMFuZn5UoZIL1Rus21dJhZla3KsNOKvhz5J3QNlmzSC0AjYAC8/PUllQTrHay+jzWqfq3RhKmb8YuAIqkkFQrvQEanVXelXxQhQ4xfUlvsIx60CbpFBMbUz45QkWN+lyut0YoKPLLV0UbibfnnI/8f297rrM2Wv29rh8pBHF8E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735367182; c=relaxed/simple; bh=au64Cqx/6qafw5PjD7DllligEfi2d3TPqFSMC/o7EE8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tqmPAwg09lNh15VlqOxNanWu4bF9U4g2uTlJ38EYNM8kYoDMJSXw3NCgtLr13tZLyRj2TC4vbN2Fx8BF7u4ypz7xpYheOGse6YRsA54ioj05Mh//+gu0Ku6p5/AECWkVT0UXEKBfZY8HGSsZrB8ykLlJIVjle8C5noMt1o6818A= 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=dCUH4A1M; arc=none smtp.client-ip=209.85.214.181 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="dCUH4A1M" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-215464b0432so9329765ad.0 for ; Fri, 27 Dec 2024 22:26:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735367181; x=1735971981; 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=FYwhhUU5+JvkMdb/ARwJEzKq3VTQKIxokm8aUHTCdGc=; b=dCUH4A1Mu7H7HGGKeNUg9H0qljnp3z6Qi35zoJox+S0zUPpBLaZ7CqjwVsp1oowQMP v6P7aAGGGzbErx/MZd3UW+NE/JpJcarnUhLA2pfE14kPx/rwPuHC1fOz9c8kxwaMLVk0 HR5wCCTRviuLf+rvk5Sc5WW2LViij6lhfrg7jjVxnKRjKxt2sVuSoBL93IEoKEHEFAl6 m8RsYEN8v+scHJfEAOmcOVrKWnGQTIefLy2pywn4tB88rz5Fyd82ZxuDt5SMUUen7Ht6 8goOlte0WWJBAmfBbDbxkLexgeOlODlGTMrtgvVze4GjU3aajoe2wyjhkylwNSShtcuY LCgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735367181; x=1735971981; 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=FYwhhUU5+JvkMdb/ARwJEzKq3VTQKIxokm8aUHTCdGc=; b=hCiP582UXPfRDPov1YGiScAPRBmvjV7xOf+o7vm6u5DdRFV18T/Ysv5c38uVA2Hr/p fnetKgkw8Z+HAZiR9vyXFJGzKV1HBlPVDgwd80U4bC4IqP0uzLobkP3pojynYbNR3Kt7 Y0AMeCssUL8NUmIlL3FxOF/ct0zgTjjSbSrsXITTZ7Ht65mKESYQybuS2jIlFfdIehpG 3MwZg4p11CTdo7CLAweEVj6z9HMRYdzc+sZJ+tHbn27TVgg++N3VUZtpARl0nGP88//6 pohy0H6wxC3BPXYCzoh6mgaOaZoJ2iNaoHCE/F1ug0kIvfVz2bngbPq9MT5vwegfow8Z q1qg== X-Forwarded-Encrypted: i=1; AJvYcCVELBj5Ms01JlxvObTfLSxEt3XJ2QXbqhpHcXwpDtXGDFlCd5kZDRFI3zjGtXwA3GGkn+fZfFmape/NATc=@vger.kernel.org X-Gm-Message-State: AOJu0YzJW/DRi59ke9OoW9443au8nSawDS5oWKxis+/HDnpv4oWHFwvy gDN2hvVOXk2Scl9ZClMwvuXiImCySrb7B3+1bpSysEbM+lCcbKsh X-Gm-Gg: ASbGncuk0uBjIFYzaDpWueRmOfWMZ6VzElcIUQ7ccA9PTuJeU0wtEbx4spPNXbFizBi 1SLbTH7eTv0xDBwCjJvBaXoHGhLSsOtaK3z3XLLd5oA69g4G9+Wb67CEsrb8KCPAs+mNib711dN awmnn/3qKw4XF8DU80Izoj+hkRdiBiA3djiSKNDf7Ru+WBjuJD2do18+XQbPeum/pFfWhwYX6AW svOt5vsRKIxSQTtv1Th26sOnHHmd/g4aHYB/BfoJH/RadY3f75ysDw= X-Google-Smtp-Source: AGHT+IGI2ouDUS8lEVfyss0H+CtKbXC/zio4nOllHtiI2aYzRsO3rzRg7NByjNEyx5UYRJ/X9Jxd6A== X-Received: by 2002:a17:902:ecc7:b0:20c:df08:9a78 with SMTP id d9443c01a7336-219e6f26809mr147224445ad.13.1735367180371; Fri, 27 Dec 2024 22:26:20 -0800 (PST) Received: from ice.. ([171.76.83.141]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f73f6sm144479455ad.222.2024.12.27.22.26.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 22:26:20 -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 15/15] staging: gpib: tnt4882: Handle gpib_register_driver() errors Date: Sat, 28 Dec 2024 11:38:03 +0530 Message-Id: <20241228060800.107653-16-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: quoted-printable Content-Type: text/plain; charset="utf-8" The error value from the init_ni_gpib_cs() function is not returned and the previous registering functions are not unregistered. The function gpib_register_driver() can fail and similar to pcmcia_register_driver() function failing, the previous registering functions are not unregistered. Unregister the gpib and pci register functions if the subsequent gpib or pcmcia register functions fail and return the error value. Signed-off-by: Nihar Chaithanya --- drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 87 ++++++++++++++++++--- 1 file changed, 74 insertions(+), 13 deletions(-) diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/= gpib/tnt4882/tnt4882_gpib.c index e49a952fa0d8..eab7fd121f0c 100644 --- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c +++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c @@ -1524,29 +1524,90 @@ static int __init tnt4882_init_module(void) =20 result =3D pci_register_driver(&tnt4882_pci_driver); if (result) { - pr_err("tnt4882: pci_driver_register failed!\n"); + pr_err("tnt4882_gpib: pci_driver_register failed: error =3D %d\n", resul= t); return result; } =20 - gpib_register_driver(&ni_isa_interface, THIS_MODULE); - gpib_register_driver(&ni_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&ni_nat4882_isa_interface, THIS_MODULE); - gpib_register_driver(&ni_nat4882_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&ni_nec_isa_interface, THIS_MODULE); - gpib_register_driver(&ni_nec_isa_accel_interface, THIS_MODULE); - gpib_register_driver(&ni_pci_interface, THIS_MODULE); - gpib_register_driver(&ni_pci_accel_interface, THIS_MODULE); + result =3D gpib_register_driver(&ni_isa_interface, THIS_MODULE); + if (result) + goto err_isa; + + result =3D gpib_register_driver(&ni_isa_accel_interface, THIS_MODULE); + if (result) + goto err_isa_accel; + + result =3D gpib_register_driver(&ni_nat4882_isa_interface, THIS_MODULE); + if (result) + goto err_nat4882_isa; + + result =3D gpib_register_driver(&ni_nat4882_isa_accel_interface, THIS_MOD= ULE); + if (result) + goto err_nat4882_isa_accel; + + result =3D gpib_register_driver(&ni_nec_isa_interface, THIS_MODULE); + if (result) + goto err_nec_isa; + + result =3D gpib_register_driver(&ni_nec_isa_accel_interface, THIS_MODULE); + if (result) + goto err_nec_isa_accel; + + result =3D gpib_register_driver(&ni_pci_interface, THIS_MODULE); + if (result) + goto err_pci; + + result =3D gpib_register_driver(&ni_pci_accel_interface, THIS_MODULE); + if (result) + goto err_pci_accel; + #ifdef GPIB_PCMCIA - gpib_register_driver(&ni_pcmcia_interface, THIS_MODULE); - gpib_register_driver(&ni_pcmcia_accel_interface, THIS_MODULE); - if (init_ni_gpib_cs() < 0) - return -1; + result =3D gpib_register_driver(&ni_pcmcia_interface, THIS_MODULE); + if (result) + goto err_pcmcia; + + result =3D gpib_register_driver(&ni_pcmcia_accel_interface, THIS_MODULE); + if (result) + goto err_pcmcia_accel; + + result =3D init_ni_gpib_cs(); + if (result) + goto err_pcmcia_driver; #endif =20 mite_init(); mite_list_devices(); =20 + pr_info("tnt4882_gpib: module init is complete\n"); return 0; + +#ifdef GPIB_PCMCIA +err_pcmcia_driver: + pr_err("tnt4882_gpib: pcmcia_register_driver failed: error =3D %d\n", res= ult); + gpib_unregister_driver(&ni_pcmcia_accel_interface); +err_pcmcia_accel: + gpib_unregister_driver(&ni_pcmcia_interface); +err_pcmcia: +#endif + gpib_unregister_driver(&ni_pci_accel_interface); +err_pci_accel: + gpib_unregister_driver(&ni_pci_interface); +err_pci: + gpib_unregister_driver(&ni_nec_isa_accel_interface); +err_nec_isa_accel: + gpib_unregister_driver(&ni_nec_isa_interface); +err_nec_isa: + gpib_unregister_driver(&ni_nat4882_isa_accel_interface); +err_nat4882_isa_accel: + gpib_unregister_driver(&ni_nat4882_isa_interface); +err_nat4882_isa: + gpib_unregister_driver(&ni_isa_accel_interface); +err_isa_accel: + gpib_unregister_driver(&ni_isa_interface); +err_isa: + pci_unregister_driver(&tnt4882_pci_driver); + + pr_err("tnt4882_gpib: gpib_register_driver failed\n"); + return result; } =20 static void __exit tnt4882_exit_module(void) --=20 2.34.1