From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: Dan Williams <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v2 3/5] dax-device: Fix error path in dax_driver_register
Date: Fri, 5 Feb 2021 23:28:40 +0100 [thread overview]
Message-ID: <20210205222842.34896-4-uwe@kleine-koenig.org> (raw)
In-Reply-To: <20210205222842.34896-1-uwe@kleine-koenig.org>
The static variable match_always_count is supposed to track if there is
a driver registered that has .match_always set. If driver_register()
fails, the previous increment must be undone.
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
---
drivers/dax/bus.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c
index 2c9e3f6f615f..bc425f1c52bd 100644
--- a/drivers/dax/bus.c
+++ b/drivers/dax/bus.c
@@ -1420,7 +1420,15 @@ int __dax_driver_register(struct dax_device_driver *dax_drv,
mutex_unlock(&dax_bus_lock);
if (rc)
return rc;
- return driver_register(drv);
+
+ rc = driver_register(drv);
+ if (rc && dax_drv->match_always) {
+ mutex_lock(&dax_bus_lock);
+ match_always_count -= dax_drv->match_always;
+ mutex_unlock(&dax_bus_lock);
+ }
+
+ return rc;
}
EXPORT_SYMBOL_GPL(__dax_driver_register);
--
2.29.2
next prev parent reply other threads:[~2021-02-06 3:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 22:28 [PATCH v2 0/5] dax-device: Some cleanups Uwe Kleine-König
2021-02-05 22:28 ` [PATCH v2 1/5] dax-device: Prevent registering drivers without probe callback Uwe Kleine-König
2021-02-05 22:28 ` [PATCH v2 2/5] dax-device: Properly handle drivers without remove callback Uwe Kleine-König
2021-02-05 22:28 ` Uwe Kleine-König [this message]
2021-02-05 22:28 ` [PATCH v2 4/5] dax-device: Drop an empty .remove callback Uwe Kleine-König
2021-02-05 22:28 ` [PATCH v2 5/5] dax-device: Make remove callback return void Uwe Kleine-König
2021-02-17 3:48 ` [PATCH v2 0/5] dax-device: Some cleanups Dan Williams
2021-02-17 3:55 ` Dan Williams
2021-02-17 6:39 ` Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205222842.34896-4-uwe@kleine-koenig.org \
--to=uwe@kleine-koenig.org \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®