From 6e0df5561285388e22b07164e5d9ba3ee40f99d7 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 5 Jun 2009 10:46:48 -0700 Subject: [PATCH] --- yaml --- r: 145498 b: refs/heads/master c: a4e4b646eb62ca4ce755e2c17aef8f42c8608821 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_bufs.c | 3 +-- trunk/drivers/media/video/ivtv/ivtv-queue.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3d8307e93e47..860b84a4bd2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c701b10283b58937201004276319ef9d9051b5d +refs/heads/master: a4e4b646eb62ca4ce755e2c17aef8f42c8608821 diff --git a/trunk/drivers/gpu/drm/drm_bufs.c b/trunk/drivers/gpu/drm/drm_bufs.c index 80a257554b30..0411d912d82a 100644 --- a/trunk/drivers/gpu/drm/drm_bufs.c +++ b/trunk/drivers/gpu/drm/drm_bufs.c @@ -371,8 +371,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, list->user_token = list->hash.key << PAGE_SHIFT; mutex_unlock(&dev->struct_mutex); - if (!(map->flags & _DRM_DRIVER)) - list->master = dev->primary->master; + list->master = dev->primary->master; *maplist = list; return 0; } diff --git a/trunk/drivers/media/video/ivtv/ivtv-queue.c b/trunk/drivers/media/video/ivtv/ivtv-queue.c index ff7b7deded4f..7fde36e6d227 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-queue.c +++ b/trunk/drivers/media/video/ivtv/ivtv-queue.c @@ -230,7 +230,8 @@ int ivtv_stream_alloc(struct ivtv_stream *s) return -ENOMEM; } if (ivtv_might_use_dma(s)) { - s->sg_handle = pci_map_single(itv->pdev, s->sg_dma, sizeof(struct ivtv_sg_element), s->dma); + s->sg_handle = pci_map_single(itv->pdev, s->sg_dma, + sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE); ivtv_stream_sync_for_cpu(s); }