diff options
| author | Linus Torvalds | 2020-12-19 11:53:47 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-12-19 11:53:47 -0800 |
| commit | c2703b66172fff39122012e42986b44c9c6ad5f1 (patch) | |
| tree | feb9ed675fc2a15a46697d0f7b9679bb01e2edf0 | |
| parent | d56154c7e8ba090126a5a2cb76098628bc2216a2 (diff) | |
| parent | 8a77ed6d1fdda752f6b3203391a099f590a9454f (diff) | |
Merge tag 'hsi-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
"Misc cleanups"
* tag 'hsi-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: core: fix a kernel-doc markup
HSI: omap_ssi: Don't jump to free ID in ssi_add_controller()
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 2 | ||||
| -rw-r--r-- | drivers/hsi/hsi_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index fa69b94debd9..7596dc164648 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c @@ -355,7 +355,7 @@ static int ssi_add_controller(struct hsi_controller *ssi, err = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL); if (err < 0) - goto out_err; + return err; ssi->id = err; ssi->owner = THIS_MODULE; diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c index 47f0208aa7c3..c3fb5beb846e 100644 --- a/drivers/hsi/hsi_core.c +++ b/drivers/hsi/hsi_core.c @@ -352,7 +352,7 @@ static void hsi_port_release(struct device *dev) } /** - * hsi_unregister_port - Unregister an HSI port + * hsi_port_unregister_clients - Unregister an HSI port * @port: The HSI port to unregister */ void hsi_port_unregister_clients(struct hsi_port *port) |