diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-09-04 03:01:02 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-09-04 03:01:02 +0400 |
| commit | ef25bd84edba73f78ce7397ef3d7b97e2774ed07 (patch) | |
| tree | 091dc19c84161b5b9c359dc2f2efc40a52b4df75 /drivers/gpu/host1x/dev.c | |
| parent | f33bcab9e816c5bf56b74c3007790f2a256910eb (diff) | |
| parent | 03da0e7ba9e3a1fc700f60913ff6bcb19f7eac2a (diff) | |
| download | linux-ef25bd84edba73f78ce7397ef3d7b97e2774ed07.tar.xz | |
Merge tag 'drm/for-3.12-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v3.12-rc1
Only a couple of small patches this time around. These are mostly fixes
for minor bugs that showed up, but there is also some preparatory work
that will come in handy for future patches.
* tag 'drm/for-3.12-rc1' of git://anongit.freedesktop.org/tegra/linux:
drm/tegra: Parse device tree earlier
gpu: host1x: Sort drivers by probe order
gpu: host1x: Check for valid host1x pointer
gpu: host1x: returning success instead of -ENOMEM
gpu: host1x: fix an integer overflow check
drm/tegra: hdmi: Make sure clock is enabled before dumping registers
Diffstat (limited to 'drivers/gpu/host1x/dev.c')
| -rw-r--r-- | drivers/gpu/host1x/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index 28e28a23d444..471630299878 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -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) |