diff --git a/include/linux/device.h b/include/linux/device.h
index ca18da4768e3..d609d1a8627b 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -643,7 +643,8 @@ struct device_link {
 
 static inline struct device *kobj_to_dev(struct kobject *kobj)
 {
-	return container_of(kobj, struct device, kobj);
+	if(kobj)
+		return container_of_safe(kobj, struct device, kobj);
 }
 
 /**