diff options
-rw-r--r-- | drivers/gpu/drm/radeon/r600_cp.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cp.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_state.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index be2bba66d5d9..6f2cc74350c5 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c | |||
@@ -1811,7 +1811,7 @@ int r600_do_cleanup_cp(struct drm_device *dev) | |||
1811 | 1811 | ||
1812 | if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) { | 1812 | if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) { |
1813 | drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); | 1813 | drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); |
1814 | dev_priv->gart_info.addr = 0; | 1814 | dev_priv->gart_info.addr = NULL; |
1815 | } | 1815 | } |
1816 | } | 1816 | } |
1817 | /* only clear to the start of flags */ | 1817 | /* only clear to the start of flags */ |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index f5b7e471cc6d..6f579a8e5349 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
@@ -1541,7 +1541,7 @@ static int radeon_do_cleanup_cp(struct drm_device * dev) | |||
1541 | if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) | 1541 | if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB) |
1542 | { | 1542 | { |
1543 | drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); | 1543 | drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev); |
1544 | dev_priv->gart_info.addr = 0; | 1544 | dev_priv->gart_info.addr = NULL; |
1545 | } | 1545 | } |
1546 | } | 1546 | } |
1547 | /* only clear to the start of flags */ | 1547 | /* only clear to the start of flags */ |
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index ca00cef4502d..fa728ec6ed34 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c | |||
@@ -1986,7 +1986,7 @@ static int alloc_surface(drm_radeon_surface_alloc_t *new, | |||
1986 | 1986 | ||
1987 | /* find a virtual surface */ | 1987 | /* find a virtual surface */ |
1988 | for (i = 0; i < 2 * RADEON_MAX_SURFACES; i++) | 1988 | for (i = 0; i < 2 * RADEON_MAX_SURFACES; i++) |
1989 | if (dev_priv->virt_surfaces[i].file_priv == 0) | 1989 | if (dev_priv->virt_surfaces[i].file_priv == NULL) |
1990 | break; | 1990 | break; |
1991 | if (i == 2 * RADEON_MAX_SURFACES) { | 1991 | if (i == 2 * RADEON_MAX_SURFACES) { |
1992 | return -1; | 1992 | return -1; |