Commit aa0ca6b4 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm: fix warning in drm_pci.c 



Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 1fad9949

drivers/char/drm/drm_pci.c

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align, 
				dma_addr_t maxaddr)

{

	drm_dma_handle_t *dmah;

#if DRM_DEBUG_MEMORY

#ifdef DRM_DEBUG_MEMORY

	int area = DRM_MEM_DMA;



	spin_lock(&drm_mem_lock);
@@ -81,7 +81,7 @@ drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align, 
	dmah->size = size;

	dmah->vaddr = pci_alloc_consistent(dev->pdev, size, &dmah->busaddr);



#if DRM_DEBUG_MEMORY

#ifdef DRM_DEBUG_MEMORY

	if (dmah->vaddr == NULL) {

		spin_lock(&drm_mem_lock);

		++drm_mem_stats[area].fail_count;
@@ -116,14 +116,14 @@ EXPORT_SYMBOL(drm_pci_alloc); 
void

__drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah)

{

#if DRM_DEBUG_MEMORY

#ifdef DRM_DEBUG_MEMORY

	int area = DRM_MEM_DMA;

	int alloc_count;

	int free_count;

#endif



	if (!dmah->vaddr) {

#if DRM_DEBUG_MEMORY

#ifdef DRM_DEBUG_MEMORY

		DRM_MEM_ERROR(area, "Attempt to free address 0\n");

#endif

	} else {
@@ -131,7 +131,7 @@ __drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah) 
				    dmah->busaddr);

	}



#if DRM_DEBUG_MEMORY

#ifdef DRM_DEBUG_MEMORY

	spin_lock(&drm_mem_lock);

	free_count = ++drm_mem_stats[area].free_count;

	alloc_count = drm_mem_stats[area].succeed_count;