dmaengine: remove DMA unmap flags

[linux-2.6-block.git] / drivers / media / platform / timblogiw.c

diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
index a2f7bdd5104f684324fb514600c7a02fbe367e75..59a95e3ab0e31bff666a2388dbf512e35eec9624 100644 (file)
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/media/platform/timblogiw.c
@@ -239,13 +239,12 @@ static int timblogiw_querycap(struct file *file, void  *priv,
        struct video_device *vdev = video_devdata(file);
 
        dev_dbg(&vdev->dev, "%s: Entry\n",  __func__);
-       memset(cap, 0, sizeof(*cap));
        strncpy(cap->card, TIMBLOGIWIN_NAME, sizeof(cap->card)-1);
        strncpy(cap->driver, DRIVER_NAME, sizeof(cap->driver) - 1);
-       strlcpy(cap->bus_info, vdev->name, sizeof(cap->bus_info));
-       cap->version = TIMBLOGIW_VERSION_CODE;
-       cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
+       snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", vdev->name);
+       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
                V4L2_CAP_READWRITE;
+       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 
        return 0;
 }
@@ -566,7 +565,7 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 
        desc = dmaengine_prep_slave_sg(fh->chan,
                buf->sg, sg_elems, DMA_DEV_TO_MEM,
-               DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+               DMA_PREP_INTERRUPT);
        if (!desc) {
                spin_lock_irq(&fh->queue_lock);
                list_del_init(&vb->queue);
@@ -834,11 +833,9 @@ static int timblogiw_probe(struct platform_device *pdev)
                goto err_request;
        }
 
-
        return 0;
 
 err_request:
-       platform_set_drvdata(pdev, NULL);
        v4l2_device_unregister(&lw->v4l2_dev);
 err_register:
        kfree(lw);
@@ -858,8 +855,6 @@ static int timblogiw_remove(struct platform_device *pdev)
 
        kfree(lw);
 
-       platform_set_drvdata(pdev, NULL);
-
        return 0;
 }