18 Dec, 2009

1 commit


12 Dec, 2009

1 commit

  • This patch (as1302) removes the auto_pm flag from struct usb_device.
    The flag's only purpose was to distinguish between autosuspends and
    external suspends, but that information is now available in the
    pm_message_t argument passed to suspend methods.

    Signed-off-by: Alan Stern
    Signed-off-by: Greg Kroah-Hartman

    Alan Stern
     

10 Dec, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
    tree-wide: fix misspelling of "definition" in comments
    reiserfs: fix misspelling of "journaled"
    doc: Fix a typo in slub.txt.
    inotify: remove superfluous return code check
    hdlc: spelling fix in find_pvc() comment
    doc: fix regulator docs cut-and-pasteism
    mtd: Fix comment in Kconfig
    doc: Fix IRQ chip docs
    tree-wide: fix assorted typos all over the place
    drivers/ata/libata-sff.c: comment spelling fixes
    fix typos/grammos in Documentation/edac.txt
    sysctl: add missing comments
    fs/debugfs/inode.c: fix comment typos
    sgivwfb: Make use of ARRAY_SIZE.
    sky2: fix sky2_link_down copy/paste comment error
    tree-wide: fix typos "couter" -> "counter"
    tree-wide: fix typos "offest" -> "offset"
    fix kerneldoc for set_irq_msi()
    spidev: fix double "of of" in comment
    comment typo fix: sybsystem -> subsystem
    ...

    Linus Torvalds
     

08 Dec, 2009

1 commit


06 Dec, 2009

2 commits

  • Conflicts:
    drivers/net/pcmcia/fmvj18x_cs.c
    drivers/net/pcmcia/nmclan_cs.c
    drivers/net/pcmcia/xirc2ps_cs.c
    drivers/net/wireless/ray_cs.c

    David S. Miller
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)
    pcmcia: rework the irq_req_t typedef
    pcmcia: remove deprecated handle_to_dev() macro
    pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
    pcmcia: remove unused "window_t" typedef
    pcmcia: move some window-related code to pcmcia_ioctl.c
    pcmcia: Change window_handle_t logic to unsigned long
    pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
    pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
    pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
    drivers/pcmcia: remove unnecessary kzalloc
    pcmcia: correct handling for Zoomed Video registers in topic.h
    pcmcia: fix printk formats
    pcmcia: autoload module pcmcia
    pcmcia/staging: update comedi drivers
    PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
    PCMCIA: ss: allow PCI IRQs > 255
    PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
    PCMCIA: soc_common: constify soc_pcmcia_socket ops member
    PCMCIA: sa1111: remove duplicated initializers
    PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
    ...

    Linus Torvalds
     

04 Dec, 2009

7 commits


29 Nov, 2009

1 commit

  • Most of the irq_req_t typedef'd struct can be re-worked quite
    easily:

    (1) IRQInfo2 was unused in any case, so drop it.

    (2) IRQInfo1 was used write-only, so drop it.

    (3) Instance (private data to be passed to the IRQ handler):
    Most PCMCIA drivers using pcmcia_request_irq() to actually
    register an IRQ handler set the "dev_id" to the same pointer
    as the "priv" pointer in struct pcmcia_device. Modify the two
    exceptions (ipwireless, ibmtr_cs) to also work this waym and
    set the IRQ handler's "dev_id" to p_dev->priv unconditionally.

    (4) Handler is to be of type irq_handler_t.

    (5) Handler != NULL already tells whether an IRQ handler is present.
    Therefore, we do not need the IRQ_HANDLER_PRESENT flag in
    irq_req_t.Attributes.

    CC: netdev@vger.kernel.org
    CC: linux-bluetooth@vger.kernel.org
    CC: linux-ide@vger.kernel.org
    CC: linux-wireless@vger.kernel.org
    CC: linux-scsi@vger.kernel.org
    CC: alsa-devel@alsa-project.org
    CC: Jaroslav Kysela
    CC: Jiri Kosina
    CC: Karsten Keil
    for the Bluetooth parts: Acked-by: Marcel Holtmann
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

15 Nov, 2009

1 commit

  • If the waker is killed before it can replay outstanding URBs, these URBs
    won't be freed or will be replayed at the next open. This patch closes
    the window by explicitely discarding outstanding URBs.

    Signed-off-by: Oliver Neukum
    Acked-by: Marcel Holtmann
    Signed-off-by: Linus Torvalds

    Oliver Neukum
     

12 Nov, 2009

1 commit

  • Rafael debugged a resume-time hang (with oopses in workqueue handling)
    on his laptop that was due to the 'waker' workqueue entry being
    disconnected and then released without the workqueue entry having been
    synchronized.

    Several people were involved, with Oleg Nesterov doing a debugging patch
    showing what workqueue entry was corrupt etc.

    This was a regression introduced by commit 7bee549e19 ("Bluetooth: Add
    USB autosuspend support to btusb driver") as Rafael points out (not
    actually bisected, but it became clear once the bug was found).

    Tested-and-reported-by: Rafael J. Wysocki
    Acked-by: Oliver Neukum
    Cc: Oleg Nesterov
    Cc: Tejun Heo
    Cc: Marcel Holtmann
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

09 Nov, 2009

1 commit

  • Remove all usages of the CS_CHECK macro and replace them with proper
    Linux style calling and return value checking. The extra error reporting may
    be dropped, as the PCMCIA core already complains about any (non-driver-author)
    errors.

    CC: linux-bluetooth@vger.kernel.org
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

16 Sep, 2009

1 commit


25 Aug, 2009

2 commits

  • This patch adds support of USB autosuspend to the btusb driver.

    If the device doesn't support remote wakeup, simple support based on
    up/down is provided. If the device supports remote wakeup, additional
    support for autosuspend while the interface is up is provided. This is
    done by queueing URBs in an anchor structure and waking the device up
    from a work queue on sending. Reception triggers remote wakeup.

    The last busy facility of the USB autosuspend code is used. To close
    a race between autosuspend and transmission, a counter of ongoing
    transmissions is maintained.

    Add #ifdefs for CONFIG_PM as necessary.

    Signed-off-by: Oliver Neukum
    Tested-by: Sarah Sharp
    Signed-off-by: Marcel Holtmann

    Oliver Neukum
     
  • The error message "Removed only %u out of %u pkts" is printed when multiple
    to be acked packets are queued.

    if (i++ >= pkts_to_be_removed)
    break;

    This will break out of the loop and increase the counter i when
    i==pkts_to_be_removed and the loop ends up with i=pkts_to_be_removed+1.

    The following line

    if (i != pkts_to_be_removed) {
    BT_ERR("Removed only %u out of %u pkts", i, pkts_to_be_removed);
    }

    will then display the false message.

    The counter i must not increase on the same statement.

    Signed-off-by: Wending Weng
    Signed-off-by: Marcel Holtmann

    Wending Weng
     

23 Aug, 2009

17 commits


13 Jul, 2009

1 commit

  • * Remove smp_lock.h from files which don't need it (including some headers!)
    * Add smp_lock.h to files which do need it
    * Make smp_lock.h include conditional in hardirq.h
    It's needed only for one kernel_locked() usage which is under CONFIG_PREEMPT

    This will make hardirq.h inclusion cheaper for every PREEMPT=n config
    (which includes allmodconfig/allyesconfig, BTW)

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

15 Jun, 2009

1 commit


14 Jun, 2009

1 commit