Permalink
Commits on Apr 30, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
      Staging: vme: Re-introduce necessary brackets
      Staging: iio: fix up the iio_get_new_idr_val comment
      Staging: add Add Sitecom WL-349 to rtl8192su
      Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device id
      staging: rtl8192su: add Support for Belkin F5D8053 v6
      Staging: dt3155: fix 50Hz configuration
      staging: usbip: Fix deadlock
      Staging: rtl8192su: add USB ID for 0bda:8171
      Staging: hv: name network device ethX rather than sethX
      Staging: hv: Fix up memory leak on HvCleanup
      Staging: hv: Fix a bug affecting IPv6
      staging: iio: ring_sw: Fix incorrect test on successful read of last value, causes infinite loop
      staging: iio: Function iio_get_new_idr_val() return negative value if fails.
      Staging: iio: adc: fix dangling pointers
      Staging: iio: light: fix dangling pointers
      Staging: iio: test for failed allocation
      staging: iio: lis3l02dq - incorrect ws used in container of call.
    torvalds committed Apr 30, 2010
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      serial: drivers/serial/pmac_zilog.c: add missing unlock
      serial: 8250_pnp - add Fujitsu Wacom device
      tty: Fix regressions in the char driver conversion
    torvalds committed Apr 30, 2010
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (29 commits)
      USB: sl811-hcd: Fix device disconnect
      USB: ohci-at91: fix power management hanging
      USB: rename usb_buffer_alloc() and usb_buffer_free()
      USB: ti_usb: fix printk format warning
      USB: gadget: s3c-hsotg: Add missing unlock
      USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set
      USB: oxu210hp: release spinlock on error path
      USB: serial: option: add cinterion device id
      USB: serial: option: ZTEAC8710 Support with Device ID 0xffff
      USB: serial: pl2303: Hybrid reader Uniform HCR331
      USB: option: add ID for ZTE MF 330
      USB: xhci: properly set endpoint context fields for periodic eps.
      USB: xhci: properly set the "Mult" field of the endpoint context.
      USB: OHCI: don't look at the root hub to get the number of ports
      USB: don't choose configs with no interfaces
      USB: cdc-acm: add another device quirk
      USB: fix testing the wrong variable in fs_create_by_name()
      usb: Fix tusb6010 for DMA API
      musb_core: fix musb_init_controller() error cleanup path
      MUSB: fix DaVinci glue layer dependency
      ...
    torvalds committed Apr 30, 2010
  4. edac, mce: Fix wrong mask and macro usage

    Correct two mishaps which prevented reporting error type (CECC vs UECC)
    and extended error description.
    
    Cc: <stable@kernel.org> # 32.x,  33.x
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Borislav Petkov committed with torvalds Apr 30, 2010
  5. Inotify: Fix build failure in inotify user support

    CONFIG_INOTIFY_USER defined but CONFIG_ANON_INODES undefined will result
    in the following build failure:
    
        LD      vmlinux
      fs/built-in.o: In function 'sys_inotify_init1':
      (.text.sys_inotify_init1+0x22c): undefined reference to 'anon_inode_getfd'
      fs/built-in.o: In function `sys_inotify_init1':
      (.text.sys_inotify_init1+0x22c): relocation truncated to fit: R_MIPS_26 against 'anon_inode_getfd'
      make[2]: *** [vmlinux] Error 1
      make[1]: *** [sub-make] Error 2
      make: *** [all] Error 2
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    ralfbaechle committed with torvalds Mar 8, 2010
  6. Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      spi: spidev_test gives error upon 1-byte transfer
      omap2_mcspi: small fixes of output data format
      omap2_mcspi: Flush posted writes
      spi: spi_device memory should be released instead of device.
      spi: release device claimed by bus_find_device_by_name
      of: check for IS_ERR()
      serial/mpc52xx_uart: Drop outdated comments
      gpio: potential null dereference
    torvalds committed Apr 30, 2010
  7. Staging: vme: Re-introduce necessary brackets

    Somehow I managed to remove a set of rather necessary brackets in commit
    29848ac. Put them back.
    
    Signed-off-by: Martyn Welch <martyn.welch@ge.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Martyn Welch committed with gregkh Mar 22, 2010
  8. Staging: iio: fix up the iio_get_new_idr_val comment

    improve the comment a bit
    
    Cc: Greg KH <greg@kroah.com>
    Cc: Jonathan Cameron <jic23@cam.ac.uk>
    Cc: Sonic Zhang <sonic.adi@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Andrew Morton committed with gregkh Apr 27, 2010
  9. Staging: add Add Sitecom WL-349 to rtl8192su

    Add usb id of Sitecom WL-349 to rtl8192su
    
    Signed-off-by: Rodrigo Linfati <rodrigo@linfati.cl>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    rlinfati committed with gregkh Apr 28, 2010
  10. Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device id

    Add Belkin F5D8055 Wireless-N USB support to the rt2870
    staging driver.
    
    Signed-off-by: Chris Largret <largret@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Chris Largret committed with gregkh Mar 3, 2010
  11. staging: rtl8192su: add Support for Belkin F5D8053 v6

    Please find attached a patch which adds the device ID for the Belkin
    F5D8053 v6 to the rtl8192su driver. I've tested this in 2.6.34-rc3
    (Ubuntu 9.10 amd64) and the network adapter is working flawlessly.
    
    Signed-off-by: Richard Airlie <richard@backtrace.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Richard Airlie committed with gregkh Apr 5, 2010
  12. Staging: dt3155: fix 50Hz configuration

    According to the header file, dt3155_io.h, the 50/60 Hz configuration
    is controlled by a bit in the I2C CSR2 register (bit 2).  The function
    dt3155_init_isr actually reads the I2C CONFIG register into the global
    I2C_CSR union variable then modifies the bit.  It then does a write
    to the I2C CONFIG register with the global I2C_CONFIG union variable
    which is not even set with a value anywhere in the driver.
    
    My guess is 50Hz operation doesn't even work as-is.
    
    Fix this by actually reading and writing the correct register with
    the correct value.
    
    Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Cc: Simon Horman <horms@verge.net.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    H Hartley Sweeten committed with gregkh Apr 14, 2010
  13. staging: usbip: Fix deadlock

    When detaching a port from the client side (usbip --detach 0),
    the event thread, on the server side, is going to deadlock.
    The "eh" server thread is getting USBIP_EH_RESET event and calls:
      -> stub_device_reset() -> usb_reset_device()
    the USB framework is then calling back _in the same "eh" thread_ :
      -> stub_disconnect() -> usbip_stop_eh() -> wait_for_completion()
    the "eh" thread is being asleep forever, waiting for its own completion.
    This patch checks if "eh" is the current thread, in usbip_stop_eh().
    
    Signed-off-by: Eric Lescouet <eric@lescouet.org>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Eric Lescouet committed with gregkh Apr 24, 2010
  14. Staging: rtl8192su: add USB ID for 0bda:8171

    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    proski committed with gregkh Mar 10, 2010
  15. Staging: hv: name network device ethX rather than sethX

    This patch makes the HyperV network device use the same naming scheme as
    other virtual drivers (Xen, KVM). In an ideal world, userspace tools
    would not care what the name is, but some users and applications do
    care. Vyatta CLI is one of the tools that does depend on what the name
    is.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Cc: Hank Janssen <hjanssen@microsoft.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Stephen Hemminger committed with gregkh Mar 11, 2010
  16. Staging: hv: Fix up memory leak on HvCleanup

    Don't assign NULL too early
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Hank Janssen <hjanssen@microsoft.com>
    Cc: Haiyang Zhang <haiyangz@microsoft.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    cyrillos committed with gregkh Apr 5, 2010
  17. Staging: hv: Fix a bug affecting IPv6

    Fix a bug affecting IPv6
    Added the multicast flag for proper IPv6 function.
    
    Reported-by: Toshikazu Sakai <toshikas@microsoft.com>
    Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    haiyangz committed with gregkh Apr 19, 2010
  18. staging: iio: ring_sw: Fix incorrect test on successful read of last …

    …value, causes infinite loop
    
    This is a bad one. The test means that almost no reads of the last
    value ever succeed!  Result is an infinite loop.
    
    Another one for the 'oops' category.
    
    Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Jonathan Cameron committed with gregkh Mar 30, 2010
  19. staging: iio: Function iio_get_new_idr_val() return negative value if…

    … fails.
    
    Function iio_get_new_idr_val() return negative value if fails.
    So, only error when ret < 0 in iio_device_register_eventset().
    
    Signed-off-by: Sonic Zhang <sonic.adi@gmail.com>
    Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Sonic Zhang committed with gregkh Mar 22, 2010
  20. Staging: iio: adc: fix dangling pointers

    Fix I2C-drivers which missed setting clientdata to NULL before freeing the
    structure it points to. Also fix drivers which do this _after_ the structure
    was freed already.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Wolfram Sang committed with gregkh Mar 20, 2010
  21. Staging: iio: light: fix dangling pointers

    Fix I2C-drivers which missed setting clientdata to NULL before freeing the
    structure it points to. Also fix drivers which do this _after_ the structure
    was freed already.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Wolfram Sang committed with gregkh Mar 20, 2010
  22. Staging: iio: test for failed allocation

    We should return test to see if iio_allocate_trigger() fails and return -ENOMEM.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    error27 committed with gregkh Mar 16, 2010
  23. staging: iio: lis3l02dq - incorrect ws used in container of call.

    The word oops comes to mind.  Original patch to merge the two work queues
    in here (prior to Greg taking them into staging) changed the top half to
    only use one of them and the bottom half to assume it was the other.
    
    Currently causes a NULL pointer dereference if you enable any of the events
    on an lis3l02dq. Just goes to show I need a few more regression tests.
    
    
    Signed-of-by: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Jonathan Cameron committed with gregkh Mar 11, 2010
  24. USB: sl811-hcd: Fix device disconnect

    A while ago I provided a patch that fixed device detection after device
    removal (USB: sl811-hcd: Fix device disconnect).
    Chris Brissette pointed out that the detection/removal counter method
    to distinguish insert or remove my fail under certain conditions.
    Latest SL811HS datasheet (Document 38-08008 Rev. *D) indicates that
    bit 6 (SL11H_INTMASK_RD) of the Interrupt Status Register together with
    bit 5 (SL11H_INTMASK_INSRMV) can be used to determine whether a device
    has been inserted or removed.
    
    Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    mhennerich committed with gregkh Apr 28, 2010
  25. USB: ohci-at91: fix power management hanging

    A hanging has been detected in ohci-at91 while going in suspend to ram. This is
    due to asynchronous operations between ohci reset and ohci clocks shutdown.
    This patch adds the reading of the control register between the reset of the
    ohci and clocks stop. This "flush the writes" idea was taken from ohci-hcd.c
    file (ohci_shutdown() function).
    
    Signed-off-by: Patrice Vilchez <patrice.vilchez@atmel.com>
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    patvilchez committed with gregkh Apr 28, 2010
  26. USB: rename usb_buffer_alloc() and usb_buffer_free()

    For more clearance what the functions actually do,
    
      usb_buffer_alloc() is renamed to usb_alloc_coherent()
      usb_buffer_free()  is renamed to usb_free_coherent()
    
    They should only be used in code which really needs DMA coherency.
    
    [added compatibility macros so we can convert things easier - gregkh]
    
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: Pedro Ribeiro <pedrib@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    zonque committed with gregkh Apr 12, 2010
  27. USB: ti_usb: fix printk format warning

    Fix printk format warning in usbserial/ti_usb:
    
    drivers/usb/serial/ti_usb_3410_5052.c:1738: warning: format '%d' expects type 'int', but argument 5 has type 'size_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Randy Dunlap committed with gregkh Apr 15, 2010
  28. USB: gadget: s3c-hsotg: Add missing unlock

    In an error handling case the lock is not unlocked.  The return is
    converted to a goto, to share the unlock at the end of the function.
    
    A simplified version of the semantic patch that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @r exists@
    expression E1;
    identifier f;
    @@
    
    f (...) { <+...
    * spin_lock_irqsave (E1,...);
    ... when != E1
    * return ...;
    ...+> }
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    JuliaLawall committed with gregkh Mar 29, 2010
  29. USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set

    With patch as1329 (USB: convert to the runtime PM framework),
    we make USB_SUSPEND depend on PM_RUNTIME instead of CONFIG_PM.
    
    Also, CONFIG_USB_OTG selects CONFIG_USB_SUSPEND.
    
    If PM_RUNTIME is not enabled, and we try to enable USB_OTG,
    we will end up with CONFIG_USB_SUSPEND selected. This is
    due to a known bug with the select statement.
    
    This makes the build break on various OMAP configs (which
    have CONFIG_USB_OTG set by default, but do not yet have
    CONFIG_PM_RUNTIME enabled).
    
    Avoid this by changing the logic for CONFIG_USB_OTG from
    "select USB_SUSPEND" to "depends on USB_SUSPEND"
    
    Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
    CC: Michal Marek <mmarek@suse.cz>
    CC: Tony Lindgren <tony@atomide.com>
    CC: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    gadiyar committed with gregkh Mar 29, 2010
  30. USB: oxu210hp: release spinlock on error path

    Smatch complained about this missing spinlock.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    error27 committed with gregkh Mar 29, 2010
  31. USB: serial: option: add cinterion device id

    This adds a device id for a Cinterion device.
    
    Reported-by: John Race <John.Race@roscom.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    gregkh committed Apr 27, 2010
  32. USB: serial: option: ZTEAC8710 Support with Device ID 0xffff

    PATCH TO EXTEND SUPPORT TO AC8710 WITH 0xFFFF Product ID.
    
    Signed-off-by: Mahesh Kuruganti <maheshkuruganti@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    magtux committed with gregkh Apr 12, 2010
  33. USB: serial: pl2303: Hybrid reader Uniform HCR331

    I tried a magnetic stripe reader
    (http://www.kimaldi.com/kimaldi_eng/productos/lectores_de_tarjetas/lectores_tarjeta_chip_y_dni/lector_hibrido_uniform_hcr_331)
    and I see that it is interfaced with a PL2303. I wrote a patch to use
    your driver which simply adds the product ID for the device and it
    seems working fine.
    
    
    From: Simone Contini <s.contini@oltrelinux.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    scontini76 committed with gregkh Apr 12, 2010
  34. USB: option: add ID for ZTE MF 330

    Based on the information provided for by Paweł Drobek, add
    a second vendor ID and the correct product ID for ZTE MF 330.
    
    Reported-by: Paweł Drobek <pawel.drobek@gmail.com>
    Signed-off: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Dominik Brodowski committed with gregkh Apr 14, 2010
  35. USB: xhci: properly set endpoint context fields for periodic eps.

    For periodic endpoints, we must let the xHCI hardware know the maximum
    payload an endpoint can transfer in one service interval.  The xHCI
    specification refers to this as the Maximum Endpoint Service Interval Time
    Payload (Max ESIT Payload).  This is used by the hardware for bandwidth
    management and scheduling of packets.
    
    For SuperSpeed endpoints, the maximum is calculated by multiplying the max
    packet size by the number of bursts and the number of opportunities to
    transfer within a service interval (the Mult field of the SuperSpeed
    Endpoint companion descriptor).  Devices advertise this in the
    wBytesPerInterval field of their SuperSpeed Endpoint Companion Descriptor.
    
    For high speed devices, this is taken by multiplying the max packet size by the
    "number of additional transaction opportunities per microframe" (the high
    bits of the wMaxPacketSize field in the endpoint descriptor).
    
    For FS/LS devices, this is just the max packet size.
    
    The other thing we must set in the endpoint context is the Average TRB
    Length.  This is supposed to be the average of the total bytes in the
    transfer descriptor (TD), divided by the number of transfer request blocks
    (TRBs) it takes to describe the TD.  This gives the host controller an
    indication of whether the driver will be enqueuing a scatter gather list
    with many entries comprised of small buffers, or one contiguous buffer.
    
    It also takes into account the number of extra TRBs you need for every TD.
    This includes No-op TRBs and Link TRBs used to link ring segments
    together.  Some drivers may choose to chain an Event Data TRB on the end
    of every TD, thus increasing the average number of TRBs per TD.  The Linux
    xHCI driver does not use Event Data TRBs.
    
    In theory, if there was an API to allow drivers to state what their
    bandwidth requirements are, we could set this field accurately.  For now,
    we set it to the same number as the Max ESIT payload.
    
    The Average TRB Length should also be set for bulk and control endpoints,
    but I have no idea how to guess what it should be.
    
    Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Sarah Sharp committed with gregkh Apr 16, 2010