Pull context-bitmap into release branch

[powerpc.git] / drivers / char / drm / ati_pcigart.c

diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index d07ce96..efff0ee 100644 (file)
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -203,9 +203,10 @@ int drm_ati_pcigart_init(drm_device_t * dev, drm_ati_pcigart_info * gart_info)
 
                for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
                        if (gart_info->is_pcie)
-                               *pci_gart = (cpu_to_le32(page_base) >> 8) | 0xc;
+                               *pci_gart = cpu_to_le32((page_base >> 8) | 0xc);
                        else
-                               *pci_gart++ = cpu_to_le32(page_base);
+                               *pci_gart = cpu_to_le32(page_base);
+                       pci_gart++;
                        page_base += ATI_PCIGART_PAGE_SIZE;
                }
        }