git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'fbdev-v5.2' of git://github.com/bzolnier/linux
[sfrench/cifs-2.6.git]
/
include
/
linux
/
device.h
diff --git
a/include/linux/device.h
b/include/linux/device.h
index 4457e560bc2b09cf3f10e943aa1fcfe40a0ebd49..e85264fb66161408aee2815001d8d5159ab04ac1 100644
(file)
--- a/
include/linux/device.h
+++ b/
include/linux/device.h
@@
-1229,7
+1229,7
@@
static inline void device_lock_assert(struct device *dev)
static inline struct device_node *dev_of_node(struct device *dev)
{
- if (!IS_ENABLED(CONFIG_OF))
+ if (!IS_ENABLED(CONFIG_OF)
|| !dev
)
return NULL;
return dev->of_node;
}