1. 01 10月, 2006 5 次提交
    • J
      [PATCH] Split struct request ->flags into two parts · 4aff5e23
      Jens Axboe 提交于
      Right now ->flags is a bit of a mess: some are request types, and
      others are just modifiers. Clean this up by splitting it into
      ->cmd_type and ->cmd_flags. This allows introduction of generic
      Linux block message types, useful for sending generic Linux commands
      to block devices.
      Signed-off-by: NJens Axboe <axboe@suse.de>
      4aff5e23
    • J
      [PATCH] i2c: Prevent deadlock on i2c client registration · 77ed74da
      Jean Delvare 提交于
      Delay the call to adapter->client_register() until after we are
      certain that the client registration is a success. At this point the
      client is fully initialized and we no longer hold the adapter->clist
      mutex, so this should prevent the deadlocks if the client_register()
      callback needs to take that mutex too, as is the case for the bttv
      driver.
      
      This fixes bug #7234.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      77ed74da
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 5ffd1a6a
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (180 commits)
        V4L/DVB (4641): Trivial: use lowercase letters in hex subsystem ids
        V4L/DVB (4639): Cx88: add autodetection for alternate revision of Leadtek PVR
        V4L/DVB (4638): Basic DVB-T and analog TV support for the HVR1300.
        V4L/DVB (4637): Add a default method for VIDIOC_G_PARM
        V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case
        V4L/DVB (4634): Zr36120: implement pcipci checks
        V4L/DVB (4632): Zoran: Implement pcipci failure check
        V4L/DVB (4631): Av7110: remove V4L2_CAP_VBI_CAPTURE flag
        V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed
        V4L/DVB (4629): Saa7134: add card support for Proteus Pro 2309
        V4L/DVB (4628): Fix VIDIOC_ENUMSTD ioctl in videodev.c
        V4L/DVB (4627): Vivi crashes with mplayer
        V4L/DVB (4626): On saa7111/7113, LUMA_CTRL need a different value
        V4L/DVB (4624): Tvaudio: Replaced kernel_thread() with kthread_run()
        V4L/DVB (4622): Copy-paste bug in videodev.c
        V4L/DVB (4620): Fix AGC configuration for MOD3000P-based boards
        V4L/DVB (4619): Fixes some I2C dependencies on V4L devices
        V4L/DVB (4617): Problem with dibusb-mb.c USB IDs
        V4L/DVB (4616): [PATCH] Nebula DigiTV USB RC support
        V4L/DVB (4614): Export symbol saa7134_tvaudio_setmute from saa7134 for saa7134-alsa
        ...
      5ffd1a6a
    • L
      Merge branch 'upstream-linus' of... · 0cd43f83
      Linus Torvalds 提交于
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
      
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (48 commits)
        ieee1394: raw1394: arm functions slept in atomic context
        ieee1394: sbp2: enable auto spin-up for all SBP-2 devices
        MAINTAINERS: updates to IEEE 1394 subsystem maintainership
        ieee1394: ohci1394: check for errors in suspend or resume
        set power state of firewire host during suspend
        ieee1394: ohci1394: more obvious endianess handling
        ieee1394: ohci1394: fix endianess bug in debug message
        ieee1394: sbp2: don't prefer MODE SENSE 10
        ieee1394: nodemgr: grab class.subsys.rwsem in nodemgr_resume_ne
        ieee1394: nodemgr: fix rwsem recursion
        ieee1394: sbp2: more help in Kconfig
        ieee1394: sbp2: prevent rare deadlock in shutdown
        ieee1394: sbp2: update includes
        ieee1394: sbp2: better handling of transport errors
        ieee1394: sbp2: recheck node generation in sbp2_update
        ieee1394: sbp2: safer agent reset in error handlers
        ieee1394: sbp2: handle "sbp2util_node_write_no_wait failed"
        CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c
        ieee1394: safer definition of empty macros
        video1394: add poll file operation support
        ...
      0cd43f83
    • L
      Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6 · db1a19b3
      Linus Torvalds 提交于
      * 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
        intelfbhw.c: intelfbhw_get_p1p2 defined but not used
        intelfb: fix mtrr_reg signedness
        intelfb: update doc and Kconfig (supported devices)
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add preliminary i2c support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
        intelfb: add vsync interrupt support
      db1a19b3
  2. 30 9月, 2006 35 次提交