Merge tag 'fbdev-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[deliverable/linux.git] / drivers / of / device.c

diff --git a/drivers/of/device.c b/drivers/of/device.c
index f685e55e0717f611bf479f95d790675d6bb77bf5..dafb9736ab9b59bae3a8cd52e1daa303ea076907 100644 (file)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -85,6 +85,9 @@ ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len)
        int cplen, i;
        ssize_t tsize, csize, repend;
 
+       if ((!dev) || (!dev->of_node))
+               return -ENODEV;
+
        /* Name & Type */
        csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
                         dev->of_node->type);