Commit a8b5e037 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hsi-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI update from Sebastian Reichel:

 - memory leak fix in hsi_add_client_from_dt() error path

* tag 'hsi-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: core: fix resource leaks in hsi_add_client_from_dt()
parents 625434da 5c08b0f7
...@@ -210,8 +210,6 @@ static void hsi_add_client_from_dt(struct hsi_port *port, ...@@ -210,8 +210,6 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
if (err) if (err)
goto err; goto err;
dev_set_name(&cl->device, "%s", name);
err = hsi_of_property_parse_mode(client, "hsi-mode", &mode); err = hsi_of_property_parse_mode(client, "hsi-mode", &mode);
if (err) { if (err) {
err = hsi_of_property_parse_mode(client, "hsi-rx-mode", err = hsi_of_property_parse_mode(client, "hsi-rx-mode",
...@@ -293,6 +291,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port, ...@@ -293,6 +291,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
cl->device.release = hsi_client_release; cl->device.release = hsi_client_release;
cl->device.of_node = client; cl->device.of_node = client;
dev_set_name(&cl->device, "%s", name);
if (device_register(&cl->device) < 0) { if (device_register(&cl->device) < 0) {
pr_err("hsi: failed to register client: %s\n", name); pr_err("hsi: failed to register client: %s\n", name);
put_device(&cl->device); put_device(&cl->device);
......
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