Commit b79f9f93 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-4.21/libata-20190102' of git://git.kernel.dk/linux-block

Pull libata fix from Jens Axboe:
 "This libata change missed the original libata pull request.

  Just a single fix in here, fixing a missed reference drop"

* tag 'for-4.21/libata-20190102' of git://git.kernel.dk/linux-block:
  ata: pata_macio: add of_node_put()
parents 0f2107da 745d51dc
...@@ -483,6 +483,8 @@ static int pata_macio_cable_detect(struct ata_port *ap) ...@@ -483,6 +483,8 @@ static int pata_macio_cable_detect(struct ata_port *ap)
struct device_node *root = of_find_node_by_path("/"); struct device_node *root = of_find_node_by_path("/");
const char *model = of_get_property(root, "model", NULL); const char *model = of_get_property(root, "model", NULL);
of_node_put(root);
if (cable && !strncmp(cable, "80-", 3)) { if (cable && !strncmp(cable, "80-", 3)) {
/* Some drives fail to detect 80c cable in PowerBook /* Some drives fail to detect 80c cable in PowerBook
* These machine use proprietary short IDE cable * These machine use proprietary short IDE cable
......
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