gpu: host1x: Check for valid host1x pointer
authorThierry Reding <treding@nvidia.com>
Tue, 3 Sep 2013 06:50:39 +0000 (08:50 +0200)
committerThierry Reding <treding@nvidia.com>
Tue, 3 Sep 2013 08:10:11 +0000 (10:10 +0200)
Under rare circumstances it can happen that the host1x driver's .probe()
doesn't finish properly, in which case the device's driver-specific data
will not be set. Instead of crashing in such a situation, propagate the
error to callers of the host1x_get_drm_data() function.

Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/host1x/dev.c

index 28e28a23d444a38943f437790e7a369db42f6fa6..471630299878a88bbf300a09a0600da2c1c062eb 100644 (file)
@@ -43,7 +43,7 @@ void host1x_set_drm_data(struct device *dev, void *data)
 void *host1x_get_drm_data(struct device *dev)
 {
        struct host1x *host1x = dev_get_drvdata(dev);
-       return host1x->drm_data;
+       return host1x ? host1x->drm_data : NULL;
 }
 
 void host1x_sync_writel(struct host1x *host1x, u32 v, u32 r)