[kernel] r17261 - dists/trunk/linux-2.6/debian/patches/bugfix/all

[Aurelien Jarno]

Author: aurel32
Date: Wed Apr 27 10:09:40 2011
New Revision: 17261

Log:
Fix previous commit (inverted condition).

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch	Wed Apr 27 07:08:19 2011	(r17260)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch	Wed Apr 27 10:09:40 2011	(r17261)
@@ -20,7 +20,7 @@
  	nvbe->nr_pages = 0;
  	while (num_pages--) {
 -		if (dma_addrs[nvbe->nr_pages] != DMA_ERROR_CODE) {
-+		if (pci_dma_mapping_error(dev->pdev,
++		if (!pci_dma_mapping_error(dev->pdev,
 +					  dma_addrs[nvbe->nr_pages])) {
  			nvbe->pages[nvbe->nr_pages] =
  					dma_addrs[nvbe->nr_pages];

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch	Wed Apr 27 07:08:19 2011	(r17260)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch	Wed Apr 27 10:09:40 2011	(r17261)
@@ -20,7 +20,7 @@
  		/* On TTM path, we only use the DMA API if TTM_PAGE_FLAG_DMA32
  		 * is requested. */
 -		if (dma_addr[i] != DMA_ERROR_CODE) {
-+		if (pci_dma_mapping_error(rdev->pdev, dma_addr[i])) {
++		if (!pci_dma_mapping_error(rdev->pdev, dma_addr[i])) {
  			rdev->gart.ttm_alloced[p] = true;
  			rdev->gart.pages_addr[p] = dma_addr[i];
  		} else {