GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 10:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'for-5.12/dax' into libnvdimm-fixes

Browse source 
Pick up dax compile fix.
This commit is contained in:
Dan Williams 2021-04-09 22:00:09 -07:00
commit 11d2498f15
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/dax/bus.c
View file

@ -90,13 +90,11 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf,
list_add(&dax_id->list, &dax_drv->ids); list_add(&dax_id->list, &dax_drv->ids);
} else } else
rc = -ENOMEM; rc = -ENOMEM;
} else }
/* nothing to remove */;
} else if (action == ID_REMOVE) { } else if (action == ID_REMOVE) {
list_del(&dax_id->list); list_del(&dax_id->list);
kfree(dax_id); kfree(dax_id);
} else }
/* dax_id already added */;
mutex_unlock(&dax_bus_lock); mutex_unlock(&dax_bus_lock);
if (rc < 0) if (rc < 0)