Commit c2703b66 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents d56154c7 8a77ed6d
...@@ -355,7 +355,7 @@ static int ssi_add_controller(struct hsi_controller *ssi, ...@@ -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); err = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL);
if (err < 0) if (err < 0)
goto out_err; return err;
ssi->id = err; ssi->id = err;
ssi->owner = THIS_MODULE; ssi->owner = THIS_MODULE;
......
...@@ -352,7 +352,7 @@ static void hsi_port_release(struct device *dev) ...@@ -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 * @port: The HSI port to unregister
*/ */
void hsi_port_unregister_clients(struct hsi_port *port) void hsi_port_unregister_clients(struct hsi_port *port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment