← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/media/video/zoran/zoran_driver.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/media/video/zoran/zoran_driver.c
1254
1254
{
1255
1255
        struct zoran *zr = fh->zr;
1256
1256
 
1257
 
        /* If there is nothing to do, return immediatly */
 
1257
        /* If there is nothing to do, return immediately */
1258
1258
        if ((on && fh->overlay_active != ZORAN_FREE) ||
1259
1259
            (!on && fh->overlay_active == ZORAN_FREE))
1260
1260
                return 0;