[media] tm6000: Initialize isochronous transfers only once
authorThierry Reding <thierry.reding@avionic-design.de>
Thu, 4 Aug 2011 07:14:12 +0000 (04:14 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 31 Aug 2011 20:21:08 +0000 (17:21 -0300)
This fixes a memory leak where isochronous buffers would be set up for
each video buffer, while it is sufficient to set them up only once per
device.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-video.c

index bef6023424af4e57bff112e6f1d5d1707a55352f..873c8ee8b3ba54e16e5cad2626348635a9b463e9 100644 (file)
@@ -754,7 +754,7 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
        struct tm6000_fh     *fh  = vq->priv_data;
        struct tm6000_buffer *buf = container_of(vb, struct tm6000_buffer, vb);
        struct tm6000_core   *dev = fh->dev;
-       int rc = 0, urb_init = 0;
+       int rc = 0;
 
        BUG_ON(NULL == fh->fmt);
 
@@ -780,13 +780,9 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
                rc = videobuf_iolock(vq, &buf->vb, NULL);
                if (rc != 0)
                        goto fail;
-               urb_init = 1;
        }
 
-       if (!dev->isoc_ctl.num_bufs)
-               urb_init = 1;
-
-       if (urb_init) {
+       if (!dev->isoc_ctl.num_bufs) {
                rc = tm6000_prepare_isoc(dev);
                if (rc < 0)
                        goto fail;