← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/media/video/cx231xx/cx231xx-video.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/cx231xx/cx231xx-video.c
326
326
 */
327
327
static inline int cx231xx_isoc_copy(struct cx231xx *dev, struct urb *urb)
328
328
{
329
 
        struct cx231xx_buffer *buf;
330
329
        struct cx231xx_dmaqueue *dma_q = urb->context;
331
 
        unsigned char *outp = NULL;
332
330
        int i, rc = 1;
333
331
        unsigned char *p_buffer;
334
332
        u32 bytes_parsed = 0, buffer_size = 0;
346
344
                        return 0;
347
345
        }
348
346
 
349
 
        buf = dev->video_mode.isoc_ctl.buf;
350
 
        if (buf != NULL)
351
 
                outp = videobuf_to_vmalloc(&buf->vb);
352
 
 
353
347
        for (i = 0; i < urb->number_of_packets; i++) {
354
348
                int status = urb->iso_frame_desc[i].status;
355
349
 
429
423
 
430
424
static inline int cx231xx_bulk_copy(struct cx231xx *dev, struct urb *urb)
431
425
{
432
 
        struct cx231xx_buffer *buf;
433
426
        struct cx231xx_dmaqueue *dma_q = urb->context;
434
 
        unsigned char *outp = NULL;
435
427
        int rc = 1;
436
428
        unsigned char *p_buffer;
437
429
        u32 bytes_parsed = 0, buffer_size = 0;
449
441
                        return 0;
450
442
        }
451
443
 
452
 
        buf = dev->video_mode.bulk_ctl.buf;
453
 
        if (buf != NULL)
454
 
                outp = videobuf_to_vmalloc(&buf->vb);
455
 
 
456
444
        if (1) {
457
445
 
458
446
                /*  get buffer pointer and length */
701
689
                buf = dev->video_mode.bulk_ctl.buf;
702
690
 
703
691
        if (buf == NULL) {
704
 
                u8 *outp = NULL;
705
692
                /* first try to get the buffer */
706
693
                get_next_buf(dma_q, &buf);
707
694
 
708
 
                if (buf)
709
 
                        outp = videobuf_to_vmalloc(&buf->vb);
710
 
 
711
695
                dma_q->pos = 0;
712
696
                dma_q->field1_done = 0;
713
697
                dma_q->current_field = -1;
2561
2545
        vfd->release = video_device_release;
2562
2546
        vfd->debug = video_debug;
2563
2547
        vfd->lock = &dev->lock;
 
2548
        /* Locking in file operations other than ioctl should be done
 
2549
           by the driver, not the V4L2 core.
 
2550
           This driver needs auditing so that this flag can be removed. */
 
2551
        set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
2564
2552
 
2565
2553
        snprintf(vfd->name, sizeof(vfd->name), "%s %s", dev->name, type_name);
2566
2554