diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-05 22:03:49 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 05:12:52 +1000 |
| commit | 838f6fe7e470b7cd322b7c3e5ac8c0e09e580194 (patch) | |
| tree | 665b38f4ff69c9fce2db5a0eadc8767bc490ec87 | |
| parent | 9cba5efab5a8145ae6c52ea273553f069c294482 (diff) | |
| download | linux-838f6fe7e470b7cd322b7c3e5ac8c0e09e580194.tar.bz2 | |
drm/nv50-/fb: use dma_mapping_error() to check dma_map_page() result
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c index 7d88e17fa927..4150b0d10af8 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c @@ -253,8 +253,8 @@ nv50_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, priv->r100c08 = dma_map_page(nv_device_base(device), priv->r100c08_page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); - if (!priv->r100c08) - nv_warn(priv, "failed 0x100c08 page map\n"); + if (dma_mapping_error(nv_device_base(device), priv->r100c08)) + return -EFAULT; } else { nv_warn(priv, "failed 0x100c08 page alloc\n"); } diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c index 9f5f3ac8d4c6..b19a2b3c1081 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c @@ -97,7 +97,7 @@ nvc0_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, priv->r100c10 = dma_map_page(nv_device_base(device), priv->r100c10_page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); - if (!priv->r100c10) + if (dma_mapping_error(nv_device_base(device), priv->r100c10)) return -EFAULT; } |