summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-02 18:47:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-02 18:47:56 -0800
commitb79f9f93eb483f2757b089bb4e1eb3827a609080 (patch)
treed55c14e41ff697988e8f02205d4c689e8f872ae6 /drivers
parent0f2107daec8137e1ea8bcd6df1323ffe46a2e873 (diff)
parent745d51dc8a29e00e9ba14e090aa3c8a41e7221d9 (diff)
downloadblackbird-op-linux-b79f9f93eb483f2757b089bb4e1eb3827a609080.tar.gz
blackbird-op-linux-b79f9f93eb483f2757b089bb4e1eb3827a609080.zip
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()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_macio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 9588e685d994..8cc9c429ad95 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -483,6 +483,8 @@ static int pata_macio_cable_detect(struct ata_port *ap)
struct device_node *root = of_find_node_by_path("/");
const char *model = of_get_property(root, "model", NULL);
+ of_node_put(root);
+
if (cable && !strncmp(cable, "80-", 3)) {
/* Some drives fail to detect 80c cable in PowerBook
* These machine use proprietary short IDE cable
OpenPOWER on IntegriCloud