Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v2.6.34-git6
Commits on May 21, 2010
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
      USB: remove unused usb_buffer_alloc and usb_buffer_free macros
      usb: musb: update gfp/slab.h includes
      USB: ftdi_sio: fix legacy SIO-device header
      USB: kl5usb105: reimplement using generic framework
      USB: kl5usb105: minor clean ups
      USB: kl5usb105: fix memory leak
      USB: io_ti: use kfifo to implement write buffering
      USB: io_ti: remove unsused private counter
      USB: ti_usb: use kfifo to implement write buffering
      USB: ir-usb: fix incorrect write-buffer length
      USB: aircable: fix incorrect write-buffer length
      USB: safe_serial: straighten out read processing
      USB: safe_serial: reimplement read using generic framework
      USB: safe_serial: reimplement write using generic framework
      usb-storage: always print quirks
      USB: usb-storage: trivial debug improvements
      USB: oti6858: use port write fifo
      USB: oti6858: use kfifo to implement write buffering
      USB: cypress_m8: use kfifo to implement write buffering
      USB: cypress_m8: remove unused drain define
      ...
    
    Fix up conflicts (due to usb_buffer_alloc/free renaming) in
    	drivers/input/tablet/acecad.c
    	drivers/input/tablet/kbtab.c
    	drivers/input/tablet/wacom_sys.c
    	drivers/media/video/gspca/gspca.c
    	sound/usb/usbaudio.c
  2. @torvalds

    sound: fixup for usb_buffer_alloc/free rename

    Stephen Rothwell authored torvalds committed
    This is needed before the USB merge.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
      qlcnic: adding co maintainer
      ixgbe: add support for active DA cables
      ixgbe: dcb, do not tag tc_prio_control frames
      ixgbe: fix ixgbe_tx_is_paused logic
      ixgbe: always enable vlan strip/insert when DCB is enabled
      ixgbe: remove some redundant code in setting FCoE FIP filter
      ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
      ixgbe: fix header len when unsplit packet overflows to data buffer
      ipv6: Never schedule DAD timer on dead address
      ipv6: Use POSTDAD state
      ipv6: Use state_lock to protect ifa state
      ipv6: Replace inet6_ifaddr->dead with state
      cxgb4: notify upper drivers if the device is already up when they load
      cxgb4: keep interrupts available when the ports are brought down
      cxgb4: fix initial addition of MAC address
      cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
      cnic: Convert cnic_local_flags to atomic ops.
      can: Fix SJA1000 command register writes on SMP systems
      bridge: fix build for CONFIG_SYSFS disabled
      ARCNET: Limit com20020 PCI ID matches for SOHARD cards
      ...
    
    Fix up various conflicts with pcmcia tree drivers/net/
    {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
    wireless/orinoco/spectrum_cs.c} and feature removal
    (Documentation/feature-removal-schedule.txt).
    
    Also fix a non-content conflict due to pm_qos_requirement getting
    renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
Commits on May 20, 2010
  1. @torvalds

    Merge branch 'docs-next' of git://git.lwn.net/linux-2.6

    torvalds authored
    * 'docs-next' of git://git.lwn.net/linux-2.6:
      Add a document describing the padata interface
  2. @torvalds

    Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6

    torvalds authored
    * 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits)
      viafb: move some include files to include/linux
      viafb: Eliminate some global.h references
      viafb: get rid of i2c debug cruft
      viafb: fold via_io.h into via-core.h
      viafb: Fix initialization error paths
      viafb: Do not remove gpiochip under spinlock
      viafb: make procfs entries optional
      viafb: fix proc entry removal
      viafb: improve misc register handling
      viafb: replace inb/outb
      viafb: move some modesetting functions to a seperate file
      viafb: unify modesetting functions
      viafb: Reserve framebuffer memory for the upcoming camera driver
      viafb: Add a simple VX855 DMA engine driver
      viafb: Add a simple interrupt management infrastructure
      via: Rationalize vt1636 detection
      viafb: Introduce viafb_find_i2c_adapter()
      via: Do not attempt I/O on inactive I2C adapters
      viafb: Turn GPIO and i2c into proper platform devices
      viafb: Convert GPIO and i2c to the new indexed port ops
      ...
  3. @gregkh

    USB: remove unused usb_buffer_alloc and usb_buffer_free macros

    gregkh authored
    Now that all callers are converted over, remove the compatibility
    functions and all is good.
    
    Cc: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  4. @gregkh

    usb: musb: update gfp/slab.h includes

    Tejun Heo authored gregkh committed
    Implicit slab.h inclusion via percpu.h is about to go away.  Make sure
    gfp.h or slab.h is included as necessary.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  5. @jhovold @gregkh

    USB: ftdi_sio: fix legacy SIO-device header

    jhovold authored gregkh committed
    Length field of header was incorrectly set to available payload space
    rather than the actual payload size.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  6. @jhovold @gregkh

    USB: kl5usb105: reimplement using generic framework

    jhovold authored gregkh committed
    Kill custom read and write implementations (static per-port,
    singleton(!) urb pool).
    
    Also remove changelog header (can be retrieved through git).
    
    Read processing and write-buffer handling tested using a cp210x device
    in a loopback setup.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  7. @jhovold @gregkh

    USB: kl5usb105: minor clean ups

    jhovold authored gregkh committed
    Whitespace changes and some removed comments.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  8. @jhovold @gregkh

    USB: kl5usb105: fix memory leak

    jhovold authored gregkh committed
    Private data was not freed on error path in startup.
    
    Cc: stable <stable@kernel.org>
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  9. @jhovold @gregkh

    USB: io_ti: use kfifo to implement write buffering

    jhovold authored gregkh committed
    Kill custom fifo implementation.
    
    Compile-only tested.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  10. @jhovold @gregkh

    USB: io_ti: remove unsused private counter

    jhovold authored gregkh committed
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  11. @jhovold @gregkh

    USB: ti_usb: use kfifo to implement write buffering

    jhovold authored gregkh committed
    Kill custom fifo implementation.
    
    Compile-only tested.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12. @jhovold @gregkh

    USB: ir-usb: fix incorrect write-buffer length

    jhovold authored gregkh committed
    Returned length should include header length.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13. @jhovold @gregkh

    USB: aircable: fix incorrect write-buffer length

    jhovold authored gregkh committed
    Returned length should include header length.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  14. @jhovold @gregkh

    USB: safe_serial: straighten out read processing

    jhovold authored gregkh committed
    Clean up read processing logic.
    
    Tested using a cp210x device in a loopback setup.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15. @jhovold @gregkh

    USB: safe_serial: reimplement read using generic framework

    jhovold authored gregkh committed
    Use process_read_urb to implement read processing.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16. @jhovold @gregkh

    USB: safe_serial: reimplement write using generic framework

    jhovold authored gregkh committed
    Kill custom single-urb write implementation.
    
    Note that this driver still depended on the write callback from the old
    generic framework.
    
    Tested against original read processing using a cp210x device in a
    loopback setup.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17. @felipec @gregkh

    usb-storage: always print quirks

    felipec authored gregkh committed
    Right now quirks are printed only when the are manually overriden with
    the module parameters. It's not so useful to remind the user that his
    parameters are correctly applied; what is useful is to print out the
    quirks the user is not aware are being applied.
    
    So let's do the smart thing and print the quirks when they are present.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18. @felipec @gregkh

    USB: usb-storage: trivial debug improvements

    felipec authored gregkh committed
    Use pr_foo and dev_foo instead of printk. Maybe US_DEBUG* should be
    replaced too.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19. @jhovold @gregkh

    USB: oti6858: use port write fifo

    jhovold authored gregkh committed
    Kill private write fifo and use port fifo instead (protected under
    port lock).
    
    Compile-only tested.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  20. @jhovold @gregkh

    USB: oti6858: use kfifo to implement write buffering

    jhovold authored gregkh committed
    Kill custom fifo implementation.
    
    Use private write fifo to minimise changes to lock handling.
    
    Compile-only tested.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  21. @jhovold @gregkh

    USB: cypress_m8: use kfifo to implement write buffering

    jhovold authored gregkh committed
    Kill custom fifo implementation.
    
    Note that cypress_m8 has no port write fifo as it has no bulk-out
    endpoint.
    
    Compile-only tested.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22. @jhovold @gregkh

    USB: cypress_m8: remove unused drain define

    jhovold authored gregkh committed
    Driver uses tty-port drain these days.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  23. @jhovold @gregkh

    USB: usb_debug: set bulk out size at probe

    jhovold authored gregkh committed
    Use bulk_out_size in usb_serial_driver to set urb buffer size.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  24. @JuliaLawall @gregkh

    USB: gadget: Use kmemdup

    JuliaLawall authored gregkh committed
    Use kmemdup when some other buffer is immediately copied into the
    allocated region.
    
    A simplified version of the semantic patch that makes this change is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression from,to,size,flag;
    statement S;
    @@
    
    -  to = \(kmalloc\|kzalloc\)(size,flag);
    +  to = kmemdup(from,size,flag);
       if (to==NULL || ...) S
    -  memcpy(to, from, size);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  25. @craigshelley @gregkh

    USB: CP210x New Device IDs 11 New device IDs

    craigshelley authored gregkh committed
    Signed-off-by: Craig Shelley <craig@microtron.org.uk>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  26. @jhovold @gregkh

    USB: visor: increase bulk-out buffer size

    jhovold authored gregkh committed
    Increase the bulk-out buffer size to avoid any regression in throughput
    after replacing the old writing scheme which used dynamic buffers (e.g.
    up to 2k).
    
    256b has been determined to be a good choice for several drivers
    including ftdi_sio which used to have a more or less identical write
    implementation.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  27. @jhovold @gregkh

    USB: belkin_sa: implement line status handling

    jhovold authored gregkh committed
    Use process_read_urb to implement line status handling.
    
    Compile-only tested.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  28. @jhovold @gregkh

    USB: belkin_sa: clean up open

    jhovold authored gregkh committed
    Use generic open to submit read urb.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  29. @jhovold @gregkh

    USB: belkin_sa: minor clean-ups

    jhovold authored gregkh committed
    Remove some whitepace and comments.
    Clean up close.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  30. @jhovold @gregkh

    USB: cp210x: use generic open to start reading from device

    jhovold authored gregkh committed
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  31. @jhovold @gregkh

    USB: visor: reimplement using generic framework

    jhovold authored gregkh committed
    Kill custom read and write implementations (dynamically allocated write
    urbs).
    
    Note that I chose to remove the stat module parameter which was supposed
    to keep count of the amount of data sent and received, but which has
    been broken for three years (since b308e74
    "USB: visor driver adapted to new tty buffering" -- bytes_in was
    incorrectly updated and was thus always reported as 0).
    
    Compile-only tested.
    
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  32. @jhovold @gregkh

    USB: visor: fix memory leak

    jhovold authored gregkh committed
    Fix memory leak for some devices (Sony Clie 3.5) due to port private
    data not being freed on release.
    
    Cc: stable <stable@kernel.org>
    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Something went wrong with that request. Please try again.