diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-12-10 03:45:40 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-12-10 03:45:40 +0300 |
| commit | 96f774106ed48808a5e314741e3414c617d14460 (patch) | |
| tree | a0beee162eeaf4813495ee28d3cfdd06effbc8be /drivers/ide/pmac.c | |
| parent | 58ab5e32e6fd83e33943614e7257f2ac5823824a (diff) | |
| parent | 40e020c129cfc991e8ab4736d2665351ffd1468d (diff) | |
| download | linux-96f774106ed48808a5e314741e3414c617d14460.tar.xz | |
Merge tag 'v4.20-rc6' into for-4.21/block
Pull in v4.20-rc6 to resolve the conflict in NVMe, but also to get the
two corruption fixes. We're going to be overhauling the direct dispatch
path, and we need to do that on top of the changes we made for that
in mainline.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ide/pmac.c')
| -rw-r--r-- | drivers/ide/pmac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index c5b902b86b44..203ed4adc04a 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c @@ -920,6 +920,7 @@ static u8 pmac_ide_cable_detect(ide_hwif_t *hwif) struct device_node *root = of_find_node_by_path("/"); const char *model = of_get_property(root, "model", NULL); + of_node_put(root); /* Get cable type from device-tree. */ if (cable && !strncmp(cable, "80-", 3)) { /* Some drives fail to detect 80c cable in PowerBook */ |