1. 14 Oct, 2008 31 commits
  2. 13 Oct, 2008 9 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 7591103c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (66 commits)
        ata: Add documentation for hard disk shock protection interface (v3)
        ide: Implement disk shock protection support (v4)
        ide-cd: fix printk format warning
        piix: add Hercules EC-900 mini-notebook to ich_laptop short cable list
        ide-atapi: assign taskfile flags per device type
        ide-cd: move cdrom_info.dma to ide_drive_t.dma
        ide: add ide_drive_t.dma flag
        ide-cd: add a debug_mask module parameter
        ide-cd: convert driver to new ide debugging macro (v3)
        ide: move SFF DMA code to ide-dma-sff.c
        ide: cleanup ide-dma.c
        ide: cleanup ide_build_dmatable()
        ide: remove needless includes from ide-dma.c
        ide: switch to DMA-mapping API part #2
        ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
        ide: make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
        ide: __ide_dma_end() -> ide_dma_end()
        pmac: remove needless pmac_ide_destroy_dmatable() wrapper
        pmac: remove superfluous pmif == NULL checks
        ide: Two fixes regarding memory allocation
        ...
      7591103c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 2be4ff2f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
        pcmcia: ioctl-internal definitions
        pcmcia: cistpl header cleanup
        pcmcia: remove unused argument to pcmcia_parse_tuple()
        pcmcia: card services header cleanup
        pcmcia: device_id header cleanup
        pcmcia: encapsulate ioaddr_t
        pcmcia: cleanup device driver header file
        pcmcia: cleanup socket services header file
        pcmcia: merge ds_internal.h into cs_internal.h
        pcmcia: cleanup cs_internal.h
        pcmcia: cs_internal.h is internal
        pcmcia: use dev_printk for cs_error()
        pcmcia: remove CS_ error codes alltogether
        pcmcia: deprecate CS_BAD_TUPLE
        pcmcia: deprecate CS_BAD_ARGS
        pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
        pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
        pcmcia: deprecate CS_NO_MORE_ITEMS
        pcmcia: deprecate CS_IN_USE
        pcmcia: deprecate CS_CONFIGURATION_LOCKED
        ...
      
      Fix trivial conflict in drivers/pcmcia/ds.c manually
      2be4ff2f
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · cf2fa660
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
        V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
        V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
        V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
        V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
        V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
        V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
        V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
        V4L/DVB (9179): S2API: frontend.h cleanup
        V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
        V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
        V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
        V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
        V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
        V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
        V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
        V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
        V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
        V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
        V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
        V4L/DVB: v4l2-dev: remove duplicated #include
        ...
      cf2fa660
    • Elias Oltmanns's avatar
      ata: Add documentation for hard disk shock protection interface (v3) · 9c6102d4
      Elias Oltmanns authored
      
      
      Put some information (and pointers to more) into the kernel's doc tree,
      describing briefly the interface to the kernel's disk head unloading
      facility. Information about how to set up a complete shock protection
      system under GNU/Linux can be found on the web and is referenced
      accordingly.
      
      v3:
      Here is some final polish including various spelling corrections
      pointed out by Grant Grundler and Peter Moulder. Also, I have added some
      information about the timing constraints related to disk head parking.
      The patch looks more impressive than it really is and I think it would
      be alright just to incorporate it into the original patch so as not to
      clutter up the git log.
      Signed-off-by: default avatarElias Oltmanns <eo@nebensachen.de>
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: Tejun Heo <htejun@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      9c6102d4
    • Elias Oltmanns's avatar
      ide: Implement disk shock protection support (v4) · 4abdc6ee
      Elias Oltmanns authored
      
      
      On user request (through sysfs), the IDLE IMMEDIATE command with UNLOAD
      FEATURE as specified in ATA-7 is issued to the device and processing of
      the request queue is stopped thereafter until the specified timeout
      expires or user space asks to resume normal operation. This is supposed
      to prevent the heads of a hard drive from accidentally crashing onto the
      platter when a heavy shock is anticipated (like a falling laptop expected
      to hit the floor). Port resets are deferred whenever a device on that
      port is in the parked state.
      
      v3:
      Elias Oltmanns <eo@nebensachen.de> wrote:
      [...]
      > >> 1. Make sure that no negative value is being passed to
      > >>    jiffies_to_msecs() in ide_park_show().
      > >> 2. Drop the superfluous variable hwif in ide_special_rq().
      > >> 3. Skip initialisation of task and tf in ide_special_rq() if we are not
      > >>    handling a (un)park request.
      > >
      > > Well, #3 should have been done differently because we donn't want to
      > > check for REQ_(UN)?PARK_HEADS more often than is necessary.
      > 
      > While preparing the backport to 2.6.27, it has just occurred to me that
      > we need to clear the IDE_DFLAG_PARKED flag in ide_disk_pre_reset()
      > because this flag must not be set after *any* sort of access to the
      > device.
      
      v4:
      Fix a memory leak due to a missing blk_put_request() in
      issue_park_cmd(). Additionally, we should plug the queue when enqueueing
      the unpark request because there is no guarantee that the park timeout
      has not expired by then. Even though the chance for that to happen is
      very slim, the request might end up hanging in the queue until the next
      I/O operation is queued up. While at it, clean up the code a little:
      - make issue_park_cmd() a function of type void since nobody cares for
        the return value anyway;
      - use blk_start_queueing() instead of __blk_run_queue() since we don't
        have to worry about recursion;
      - remove a superfluous pointer deference in task_no_data_intr().
      Signed-off-by: default avatarElias Oltmanns <eo@nebensachen.de>
      Cc: Jeff Garzik <jeff@garzik.org>,
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: Tejun Heo <htejun@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      4abdc6ee
    • Alexander Beregalov's avatar
      ide-cd: fix printk format warning · 08243ba7
      Alexander Beregalov authored
      
      Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
      Cc: Borislav Petkov <petkovbb@googlemail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      08243ba7
    • Herton Ronaldo Krzesinski's avatar
    • Borislav Petkov's avatar
      ide-atapi: assign taskfile flags per device type · f9476b96
      Borislav Petkov authored
      
      
      There should be no functional change resulting from this patch.
      Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      f9476b96
    • Borislav Petkov's avatar
      ide-cd: move cdrom_info.dma to ide_drive_t.dma · 12469ac0
      Borislav Petkov authored
      
      
      There should be no functionality change resulting from this patch.
      Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      12469ac0