1. 22 3月, 2011 1 次提交
  2. 24 12月, 2010 1 次提交
    • T
      media/video: don't use flush_scheduled_work() · 8c71778c
      Tejun Heo 提交于
      This patch converts the remaining users of flush_scheduled_work() in
      media/video.
      
      * bttv-input.c and cx23885-input.c don't use workqueue at all.  No
        need to flush.
      
      * Make omap24xxcam.c and saa7134-empress.c flush the used work
        directly.
      
      * In fd_defio.c, replace cancel_delayed_work() +
        flush_scheduled_work() with cancel_delayed_work_sync().  While at
        it, replace the deprecated cancel_rearming_delayed_work() with
        cancel_delayed_work_sync().
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
      8c71778c
  3. 18 11月, 2010 1 次提交
  4. 21 10月, 2010 1 次提交
  5. 01 6月, 2010 1 次提交
  6. 30 3月, 2010 1 次提交
    • T
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking... · 5a0e3ad6
      Tejun Heo 提交于
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      
      percpu.h is included by sched.h and module.h and thus ends up being
      included when building most .c files.  percpu.h includes slab.h which
      in turn includes gfp.h making everything defined by the two files
      universally available and complicating inclusion dependencies.
      
      percpu.h -> slab.h dependency is about to be removed.  Prepare for
      this change by updating users of gfp and slab facilities include those
      headers directly instead of assuming availability.  As this conversion
      needs to touch large number of source files, the following script is
      used as the basis of conversion.
      
        http://userweb.kernel.org/~tj/misc/slabh-sweep.py
      
      The script does the followings.
      
      * Scan files for gfp and slab usages and update includes such that
        only the necessary includes are there.  ie. if only gfp is used,
        gfp.h, if slab is used, slab.h.
      
      * When the script inserts a new include, it looks at the include
        blocks and try to put the new include such that its order conforms
        to its surrounding.  It's put in the include block which contains
        core kernel includes, in the same order that the rest are ordered -
        alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
        doesn't seem to be any matching order.
      
      * If the script can't find a place to put a new include (mostly
        because the file doesn't have fitting include block), it prints out
        an error message indicating which .h file needs to be added to the
        file.
      
      The conversion was done in the following steps.
      
      1. The initial automatic conversion of all .c files updated slightly
         over 4000 files, deleting around 700 includes and adding ~480 gfp.h
         and ~3000 slab.h inclusions.  The script emitted errors for ~400
         files.
      
      2. Each error was manually checked.  Some didn't need the inclusion,
         some needed manual addition while adding it to implementation .h or
         embedding .c file was more appropriate for others.  This step added
         inclusions to around 150 files.
      
      3. The script was run again and the output was compared to the edits
         from #2 to make sure no file was left behind.
      
      4. Several build tests were done and a couple of problems were fixed.
         e.g. lib/decompress_*.c used malloc/free() wrappers around slab
         APIs requiring slab.h to be added manually.
      
      5. The script was run on all .h files but without automatically
         editing them as sprinkling gfp.h and slab.h inclusions around .h
         files could easily lead to inclusion dependency hell.  Most gfp.h
         inclusion directives were ignored as stuff from gfp.h was usually
         wildly available and often used in preprocessor macros.  Each
         slab.h inclusion directive was examined and added manually as
         necessary.
      
      6. percpu.h was updated not to include slab.h.
      
      7. Build test were done on the following configurations and failures
         were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
         distributed build env didn't work with gcov compiles) and a few
         more options had to be turned off depending on archs to make things
         build (like ipr on powerpc/64 which failed due to missing writeq).
      
         * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
         * powerpc and powerpc64 SMP allmodconfig
         * sparc and sparc64 SMP allmodconfig
         * ia64 SMP allmodconfig
         * s390 SMP allmodconfig
         * alpha SMP allmodconfig
         * um on x86_64 SMP allmodconfig
      
      8. percpu.h modifications were reverted so that it could be applied as
         a separate patch and serve as bisection point.
      
      Given the fact that I had only a couple of failures from tests on step
      6, I'm fairly confident about the coverage of this conversion patch.
      If there is a breakage, it's likely to be something in one of the arch
      headers which should be easily discoverable easily on most builds of
      the specific arch.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Guess-its-ok-by: NChristoph Lameter <cl@linux-foundation.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
      5a0e3ad6
  7. 30 1月, 2010 1 次提交
  8. 16 12月, 2009 4 次提交
  9. 13 7月, 2009 1 次提交
  10. 17 6月, 2009 2 次提交
  11. 30 3月, 2009 4 次提交
  12. 03 1月, 2009 2 次提交
  13. 22 10月, 2008 1 次提交
    • H
      V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d · c6330fb8
      Hans Verkuil 提交于
      The kernel number of a v4l2 node (e.g. videoX, radioX or vbiX) is now
      independent of the minor number. So instead of using the minor field
      of the video_device struct one has to use the num field: this always
      contains the kernel number of the device node.
      
      I forgot about this when I did the v4l2 core change, so this patch
      converts all drivers that use it in one go. Luckily the change is
      trivial.
      
      Cc: michael@mihu.de
      Cc: mchehab@infradead.org
      Cc: corbet@lwn.net
      Cc: luca.risolia@studio.unibo.it
      Cc: isely@pobox.com
      Cc: pe1rxq@amsat.org
      Cc: royale@zerezo.com
      Cc: mkrufky@linuxtv.org
      Cc: stoth@linuxtv.org
      Signed-off-by: NHans Verkuil <hverkuil@xs4all.nl>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      c6330fb8
  14. 12 10月, 2008 4 次提交
  15. 27 7月, 2008 3 次提交
  16. 26 7月, 2008 1 次提交
  17. 24 7月, 2008 1 次提交
  18. 20 7月, 2008 2 次提交
  19. 27 6月, 2008 3 次提交
    • A
      V4L/DVB (8108): Fix open/close race in saa7134 · a1789873
      Arjan van de Ven 提交于
      The saa7134 driver uses a (non-atomic) variable in an attempt to
      only allow one opener of the device (how it deals with sending
      the fd over unix sockets I don't know).
      
      Unfortunately, the release function first decrements this variable,
      and THEN goes on to disable more of the device. This allows for
      a race where another opener of the device comes in after the decrement of
      the variable, configures the hardware just to then see the hardware
      be disabled by the rest of the release function.
      
      This patch makes the release function use the same lock as the open
      function to protect the hardware as well as the variable (which now
      at least has some locking to protect it).
      Signed-off-by: NArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
      a1789873
    • M
      V4L/DVB (8022): saa7134: fix race between opening and closing the device · 913f5fc2
      Marcin Slusarz 提交于
      decrementing dev->empress_users should be done as last action of ts_release,
      because it sleeps and write access to dev->empress_started is not protected
      in any way
      (additionally closing thread could mute audio after opening thread unmuted it)
      Signed-off-by: NMarcin Slusarz <marcin.slusarz@gmail.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
      913f5fc2
    • D
      V4L/DVB (8020): Fix callbacks functions of saa7134_empress · a14fe960
      Dmitri Belimov 提交于
      If I try v4l2-ctl --all -d /dev/video1 or v4l2-ctl --streamon -d /dev/video1
      modules crashed:
      
      *pde = 00000000
      Modules linked in: ac battery loop saa7134_empress(F) saa6752hs(F) tuner_simple(F) tuner_types(F) tea5767(F) tda9887(F) tda8290(F) tea5761(F) tuner(F) snd_cmipci snd_pcm snd_page_alloc snd_opl3_lib saa7134(F) snd_mpu401 parport_pc parport snd_timer snd_hwdep snd_mpu401_uart floppy rtc psmouse videodev(F) v4l1_compat(F) compat_ioctl32(F) v4l2_common(F) videobuf_dma_sg(F) videobuf_core(F) snd_rawmidi snd_seq_device via_ircc pcspkr snd ir_kbd_i2c(F) irda soundcore ir_common(F) crc_ccitt tveeprom(F) i2c_viapro i2c_core button via_agp agpgart evdev ext3 jbd mbcache ide_cd_mod cdrom ide_disk 8139cp via82cxxx ide_core 8139too mii ehci_hcd uhci_hcd usbcore thermal processor fan
      
      EIP is at __mutex_lock_slowpath+0x29/0x7b
       DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
      Process v4l2-ctl (pid: 2742, ti=ced7e000 task=cf325260 task.ti=ced7e000)
             d08e5411 00000000 ced7fed4 00000000 d0975acb 40045612 cfa86ee0 ffffffcd
             cf2b7000 ced7febc c03858d6 00000019 00000292 d089e4ec cf37b2a0 d089e4a0
      Call Trace:
       [<c028b52b>] mutex_lock+0xa/0xb
       [<d08e5411>] videobuf_streamon+0xf/0x9a [videobuf_core]
       [<d0975acb>] __video_do_ioctl+0x136a/0x2d68 [videodev]
       [<d088f789>] task_end_request+0x40/0x51 [ide_core]
       [<d088c4aa>] ide_intr+0x187/0x192 [ide_core]
       [<c016a551>] mntput_no_expire+0x11/0x64
       [<c0160b1c>] path_walk+0x90/0x98
       [<d0977738>] video_ioctl2+0x173/0x239 [videodev]
       [<c0140936>] filemap_fault+0x202/0x370
       [<c014930a>] __do_fault+0x2c3/0x2fe
       [<c014ab03>] handle_mm_fault+0x22a/0x49f
       [<c0162737>] vfs_ioctl+0x47/0x5d
       [<c0162992>] do_vfs_ioctl+0x245/0x258
       [<c01629e6>] sys_ioctl+0x41/0x5b
       [<c01036a6>] sysenter_past_esp+0x5f/0x85
       =======================
      
      After this fix all of that commands works without problem:
      
      v4l2-ctl --all -d /dev/video1
      
      Driver Info:
      	Driver name   : saa7134
      	Card type     : Beholder BeholdTV M6 Extra
      	Bus info      : PCI:0000:00:0d.0
      	Driver version: 526
      	Capabilities  : 0x05000001
      		Video Capture
      		Read/Write
      		Streaming
      Format Video Capture:
      	Width/Height  : 720/576
      	Pixel Format  : MPEG
      	Field         : Any
      	Bytes per Line: 0
      	Size Image    : 58656
      	Colorspace    : Unknown (00000000)
      Video input : 0 (CCIR656)
      Video Standard = 0x000000ff
      	PAL-B/B1/G/H/I/D/D1/K
      
      
      P.S. data from /dev/video1 is not correct :(( .
      Signed-off-by: NBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
      a14fe960
  20. 05 6月, 2008 1 次提交
  21. 25 4月, 2008 3 次提交
  22. 18 2月, 2008 1 次提交