X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=drivers%2Facpi%2Fnfit%2Fcore.c;h=bbe48ad20886c8530fe525ffe9f35725d1df1ddc;hp=aa9d00db763a2383663e36f20a3a8509c08907da;hb=ee95f4059a833839bf52972191b2d4c3d3cec552;hpb=f81e1d35a6e36d30888c46283b8dd1022e847124

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index aa9d00db763a..bbe48ad20886 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1883,6 +1883,9 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)
 		struct kernfs_node *nfit_kernfs;
 
 		nvdimm = nfit_mem->nvdimm;
+		if (!nvdimm)
+			continue;
+
 		nfit_kernfs = sysfs_get_dirent(nvdimm_kobj(nvdimm)->sd, "nfit");
 		if (nfit_kernfs)
 			nfit_mem->flags_attr = sysfs_get_dirent(nfit_kernfs,