From 96882fd501a958e6a8b70191b60c724412b8a051 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 26 Jan 2006 08:32:14 +1100 Subject: [PATCH] --- yaml --- r: 19595 b: refs/heads/master c: 339363c4c6fe01043c51e7d6e9fbeb8feee00841 h: refs/heads/master i: 19593: 1ff3d99be9a15e5528b34005284724bae9b0a9a4 19591: b9be49481904a3868ef393a963c57cadde871320 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/via_dmablit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5e5fc0099431..3fb655398c10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de227f5f32775d86e5c780a7cffdd2e08574f7fb +refs/heads/master: 339363c4c6fe01043c51e7d6e9fbeb8feee00841 diff --git a/trunk/drivers/char/drm/via_dmablit.c b/trunk/drivers/char/drm/via_dmablit.c index 9d5e027dae0e..a28eece6281e 100644 --- a/trunk/drivers/char/drm/via_dmablit.c +++ b/trunk/drivers/char/drm/via_dmablit.c @@ -108,7 +108,7 @@ via_map_blit_for_device(struct pci_dev *pdev, int num_desc = 0; int cur_line; dma_addr_t next = 0 | VIA_DMA_DPR_EC; - drm_via_descriptor_t *desc_ptr = 0; + drm_via_descriptor_t *desc_ptr = NULL; if (mode == 1) desc_ptr = vsg->desc_pages[cur_descriptor_page]; @@ -581,7 +581,7 @@ via_build_sg_info(drm_device_t *dev, drm_via_sg_info_t *vsg, drm_via_dmablit_t * int ret = 0; vsg->direction = (draw) ? DMA_TO_DEVICE : DMA_FROM_DEVICE; - vsg->bounce_buffer = 0; + vsg->bounce_buffer = NULL; vsg->state = dr_via_sg_init;