diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 14:31:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 14:31:38 -0700 |
| commit | 00b43f85f287f4b661f1a2485bed1a476d308427 (patch) | |
| tree | b6902a1917ffbcacc03c394e77984cd5a9dae399 /drivers/nvmem/layouts.c | |
| parent | 20d9ba738b9696ee882c6ecf55cfae8fb8b64040 (diff) | |
| parent | 447b167bb60d0bb95967c4d93dac9af1cca437db (diff) | |
| download | linux-00b43f85f287f4b661f1a2485bed1a476d308427.tar.gz linux-00b43f85f287f4b661f1a2485bed1a476d308427.tar.bz2 linux-00b43f85f287f4b661f1a2485bed1a476d308427.zip | |
Merge tag 'libnvdimm-for-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Ira Weiny:
- use Open Firmware helper routines
- fix memory leak when nvdimm labels are incorrect
- remove some dead code
* tag 'libnvdimm-for-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
nvdimm: Remove dead code for ENODEV checking in scan_labels()
nvdimm: Fix devs leaks in scan_labels()
nvdimm: Use of_property_present() and of_property_read_bool()
Diffstat (limited to 'drivers/nvmem/layouts.c')
| -rw-r--r-- | drivers/nvmem/layouts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvmem/layouts.c b/drivers/nvmem/layouts.c index 77a4119efea8..65d39e19f6ec 100644 --- a/drivers/nvmem/layouts.c +++ b/drivers/nvmem/layouts.c @@ -123,7 +123,7 @@ static int nvmem_layout_bus_populate(struct nvmem_device *nvmem, int ret; /* Make sure it has a compatible property */ - if (!of_get_property(layout_dn, "compatible", NULL)) { + if (!of_property_present(layout_dn, "compatible")) { pr_debug("%s() - skipping %pOF, no compatible prop\n", __func__, layout_dn); return 0; |