← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/staging/cx25821/cx25821-video-upstream-ch2.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/cx25821/cx25821-video-upstream-ch2.c
234
234
        dev->_frame_count_ch2 = 0;
235
235
        dev->_file_status_ch2 = END_OF_FILE;
236
236
 
237
 
        if (dev->_irq_queues_ch2) {
238
 
                kfree(dev->_irq_queues_ch2);
239
 
                dev->_irq_queues_ch2 = NULL;
240
 
        }
 
237
        kfree(dev->_irq_queues_ch2);
 
238
        dev->_irq_queues_ch2 = NULL;
241
239
 
242
 
        if (dev->_filename_ch2 != NULL)
243
 
                kfree(dev->_filename_ch2);
 
240
        kfree(dev->_filename_ch2);
244
241
 
245
242
        tmp = cx_read(VID_CH_MODE_SEL);
246
243
        cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00);