Permalink
Switch branches/tags
Commits on Jun 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: rtl8192u_usb: Add LG device ID 043e:7a01
      Staging: rtl8192s_usb: Remove duplicate device ID
      Staging: rt2870: add device id for Zyxel NWD-270N
      Staging: comedi: fix read past end of array in cb_pcidda_attach()
      Staging: rtl8192su: add device ids
      Staging: rtl8192su: remove device ids
      Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2
      Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set
      Staging: wlags49_h2: add missing <linux/string.h> for strlen
      Staging: hv: fix hv_utils module to properly autoload
      staging: hv: Fix race condition on vmbus channel initialization
      Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW case
      Staging: mrst-touchscreen: fix dereferencing free memory
      Staging: batman-adv: fix function prototype
      Staging: batman-adv: return -EFAULT on copy_to_user errors
      staging: usbip: usbip_common: kill rx thread on tx thread creation error.
    torvalds committed Jun 30, 2010
  2. 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: (22 commits)
      USB: gadget: f_mass_storage: stale common->fsg value bug fix
      USB: gadget: f_mass_storage: fixed fs descriptors not being updated
      USB: musb: Enable the maximum supported burst mode for DMA
      USB: musb: fix Blackfin ulpi stubs
      USB: MUSB: make non-OMAP platforms build with CONFIG_PM=y
      USB: musb_core: make disconnect and suspend interrupts work again
      USB: obey the sysfs power/wakeup setting
      USB: gadget eth: Fix calculate CRC32 in EEM
      USB: qcserial: fix a memory leak in qcprobe error path
      USB: gadget/printer, fix sleep inside atomic
      USB: isp1362-hcd, fix double lock
      USB: serial: ftdi: correct merge conflict with CONTEC id
      USB: fix oops in usb_sg_init()
      USB: s3c2410: deactivate endpoints before gadget unbinding
      USB: ehci-mxc: bail out on transceiver problems
      USB: otg/ulpi: bail out on read errors
      usb: musb: Fix a bug by making suspend interrupt available in device mode
      USB: r8a66597: Fix failure in change of status
      USB: xHCI: Fix bug in link TRB activation change.
      USB: gadget: g_fs: possible invalid pointer reference bug fixed
      ...
    torvalds committed Jun 30, 2010
  3. 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: cpm_uart: implement the cpm_uart_early_write() function for console poll
    torvalds committed Jun 30, 2010
  4. Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      OMAP: hwmod: Fix the missing braces
      OMAP4: clock: Fix multi-omap boot with reset un-used clocks
      OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
      omap: GPIO: fix auto-disable of debounce clock
      omap: DMTIMER: Ack pending interrupt always when stopping a timer
      omap: Stalker board: switch over to gpio_set_debounce
      omap: fix build failure due to missing include dma-mapping.h
      omap iommu: Fix Memory leak
    torvalds committed Jun 30, 2010
  5. Add mdr as maintainer of qla1280 driver.

    As discussed with Mike Reed, add him as the maintainer of the qla1280
    driver as I no longer have any hardware and he is actively looking
    after it.
    
    Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jes Sorensen committed with torvalds Jun 30, 2010
  6. futex: futex_find_get_task remove credentails check

    futex_find_get_task is currently used (through lookup_pi_state) from two
    contexts, futex_requeue and futex_lock_pi_atomic.  None of the paths
    looks it needs the credentials check, though.  Different (e)uids
    shouldn't matter at all because the only thing that is important for
    shared futex is the accessibility of the shared memory.
    
    The credentail check results in glibc assert failure or process hang (if
    glibc is compiled without assert support) for shared robust pthread
    mutex with priority inheritance if a process tries to lock already held
    lock owned by a process with a different euid:
    
    pthread_mutex_lock.c:312: __pthread_mutex_lock_full: Assertion `(-(e)) != 3 || !robust' failed.
    
    The problem is that futex_lock_pi_atomic which is called when we try to
    lock already held lock checks the current holder (tid is stored in the
    futex value) to get the PI state.  It uses lookup_pi_state which in turn
    gets task struct from futex_find_get_task.  ESRCH is returned either
    when the task is not found or if credentials check fails.
    
    futex_lock_pi_atomic simply returns if it gets ESRCH.  glibc code,
    however, doesn't expect that robust lock returns with ESRCH because it
    should get either success or owner died.
    
    Signed-off-by: Michal Hocko <mhocko@suse.cz>
    Acked-by: Darren Hart <dvhltc@us.ibm.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Michal Hocko committed with torvalds Jun 30, 2010
  7. Staging: rtl8192u_usb: Add LG device ID 043e:7a01

    Add another device ID as listed in the vendor driver version
    0003.0825.2009.
    
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    bwhacks committed with gregkh Jun 25, 2010
  8. Staging: rtl8192s_usb: Remove duplicate device ID

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    bwhacks committed with gregkh Jun 25, 2010
  9. Staging: rt2870: add device id for Zyxel NWD-270N

    Add device id for Zyxel NWD-270N USB dongle.
    
    Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Ozan Çağlayan committed with gregkh Jun 21, 2010
  10. Staging: comedi: fix read past end of array in cb_pcidda_attach()

    There are only 6 elements in the cb_pcidda_boards[] array so the
    original code read past the end.  After this change nothing uses N_BOARDS
    so I removed the definition.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    error27 committed with gregkh Jun 21, 2010
  11. Staging: rtl8192su: add device ids

    This patch adds some device ids.
    The list of supported devices was extracted from realteks driver package.
    (0x050d, 0x815F) and (0x0df6, 0x004b) are not in the official list of
    supported devices  and may not work correctly.
    In case of problems with these, they should probably be removed from the list.
    
    Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Florian Schilhabel committed with gregkh Jun 8, 2010
  12. Staging: rtl8192su: remove device ids

    This patch removes some device-ids.
    The list of unsupported devices was extracted from realteks driver package.
    removed IDs are:
    (0x0bda, 0x8192)
    (0x0bda, 0x8709)
    (0x07aa, 0x0043)
    (0x050d, 0x805E)
    (0x0df6, 0x0031)
    (0x1740, 0x9201)
    (0x2001, 0x3301)
    (0x5a57, 0x0290)
    These devices are _not_ rtl819su based.
    
    Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Florian Schilhabel committed with gregkh Jun 8, 2010
  13. Staging: rtl8187se: Fix compile warnings in 2.6.35-rc2

    In commit bbfb565, the spacing in the definitions of eqMacAddr and cpMacAddr
    in drivers/staging/rtl8187se/r8180_core.c were changed to conform to kernel
    standards. These definitions were duplicates of lines found in
    drivers/staging/rtl8187se/ieee80211/dot11d.h. Once the change was made, the
    following warnings were emitted:
    
      CC [M]  drivers/staging/rtl8187se/r8180_core.o
    drivers/staging/rtl8187se/r8180_core.c:69:0: warning: "eqMacAddr" redefined
    drivers/staging/rtl8187se/ieee80211/dot11d.h:39:0: note: this is the location of the previous definition
    drivers/staging/rtl8187se/r8180_core.c:70:0: warning: "cpMacAddr" redefined
    drivers/staging/rtl8187se/ieee80211/dot11d.h:40:0: note: this is the location of the previous definition
    
    The fix is to keep only the difinition in the header file.
    
    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    lwfinger committed with gregkh Jun 7, 2010
  14. Staging: wlags49_h2: Fix build error when CONFIG_SYSFS is not set

    I got a wlags49_h2 driver build error in linux-next when CONFIG_SYSFS is not set.
    
    CC [M]  drivers/staging/wlags49_h2/wl_cs.o
    In file included from drivers/staging/wlags49_h2/wl_cs.c:104:
    drivers/staging/wlags49_h2/wl_sysfs.h: In function ‘register_wlags_sysfs’:
    drivers/staging/wlags49_h2/wl_sysfs.h:5: error: parameter name omitted
    drivers/staging/wlags49_h2/wl_sysfs.h: In function ‘unregister_wlags_sysfs’:
    drivers/staging/wlags49_h2/wl_sysfs.h:6: error: parameter name omitted
    make[1]: *** [drivers/staging/wlags49_h2/wl_cs.o] Error 1
    make: *** [_module_drivers/staging/wlags49_h2] Error 2
    
    This is due a wrong function definition (it does not include parameters names).
    
    Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    martinezjavier committed with gregkh Jun 17, 2010
  15. Staging: wlags49_h2: add missing <linux/string.h> for strlen

    On ia64, the build fails with incompatible implicit definition of strlen.
    This patch adds the <linux/string.h> include to get the real prototype.
    
    Signed-off-by: Jeff Mahoney <jeffm@suse.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    jeffmahoney committed with gregkh Jun 9, 2010
  16. Staging: hv: fix hv_utils module to properly autoload

    Added autoloading based on pci id and dmi strings.
    
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    haiyangz committed with gregkh May 19, 2010
  17. staging: hv: Fix race condition on vmbus channel initialization

    There is a possible race condition when hv_utils starts to load immediately
    after hv_vmbus is loading - null pointer error could happen.
    This patch added wait/completion to ensure all channels are ready before
    vmbus loading completes. So another module won't have any uninitialized channel.
    
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    haiyangz committed with gregkh May 28, 2010
  18. Staging: comedi: drivers: adl_pci9111: Fix AI commands in TRIG_FOLLOW…

    … case
    
    I received a report that AI streaming acquisitions do not work properly
    for the adl_pci9111 driver when convert_src is TRIG_TIMER and
    scan_begin_src is TRIG_FOLLOW (and scan_begin_arg is therefore 0).  This
    seems to be down to the incorrect setting of dev_private->scan_delay in
    pci9111_ai_do_cmd().  Under the previously stated conditions,
    dev_private->scan_delay ends up set to (unsigned int)-1, but it ought to
    be set to 0.  The function sets it to 0 initially, and it only makes
    sense to change it if both convert_src and scan_begin_src are set to
    TRIG_TIMER.
    
    Note: 'scan_delay' is the number of unwanted scans to discard after each
    valid scan.  The hardware does not support 'scan' timing as such, just a
    regularly paced conversion timer (with automatic channel switching
    between conversions).  The driver simulates a scan period that is some
    (>1) multiple of the conversion period times the scan length
    (chanlist_len samples) by reading chanlist_len samples and discarding
    the next scan_delay times chanlist_len samples.
    
    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ian-abbott committed with gregkh Jun 18, 2010
  19. Staging: mrst-touchscreen: fix dereferencing free memory

    I moved the kfree() down a couple lines after the dereference.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    error27 committed with gregkh Jun 5, 2010
  20. Staging: batman-adv: fix function prototype

    In today linux-next I got a compile warning in staging/batman-adv.
    
    This is due a struct bin_attribute read function prototype change and the driver was not updated.
    
    This patch solves the issue
    
    Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
    Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    martinezjavier committed with gregkh Jun 6, 2010
  21. Staging: batman-adv: return -EFAULT on copy_to_user errors

    copy_to_user() returns the number of bites remaining but we want to
    return a negative error code here.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    error27 committed with gregkh Jun 6, 2010
  22. staging: usbip: usbip_common: kill rx thread on tx thread creation er…

    …ror.
    
    Signed-off-by: Himanshu Chauhan <hschauhan@nulltrace.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    hschauhan committed with gregkh Jun 4, 2010
  23. USB: gadget: f_mass_storage: stale common->fsg value bug fix

    On fsg_unbind the common->fsg pointer was not NULLed if the
    unbound fsg_dev instance was the current one.  As an effect,
    the incorrect pointer was preserved in all further operations
    which caused do_set_interface to reference an invalid region.
    
    This commit fixes this by raising an exception in fsg_bind
    which will change the common->fsg pointer.  This also requires
    an wait queue so that the thread in fsg_bind can wait till the
    worker thread handles the exception.
    
    This commit removes also a config and new_config fields of
    fsg_common as they are no longer needed since fsg can be
    used to determine whether function is active or not.
    
    Moreover, this commit removes possible race condition where
    the fsg field was modified in both the worker thread and
    form various other contexts.  This is fixed by replacing
    prev_fsg with new_fsg.  At this point, fsg is assigned only
    in worker thread.
    
    Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
    Cc: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Michal Nazarewicz committed with gregkh Jun 25, 2010
  24. USB: gadget: f_mass_storage: fixed fs descriptors not being updated

    The full speed descriptors were copied to the usb_function structure
    in the fsg_bind_config function before call to the usb_ep_autoconfig.
    The usb_ep_autoconfig was called in fsg_bind using the original
    descriptors.  In effect copied descriptors were not updated.
    
    This patch changes the copy full speed descriptors after the call to
    usb_op_autoconfig is performed.  This way, copied full speed
    descriptors have updated values.
    
    Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
    Cc: Kyungmin Park <kyungmin.park@samsung.com>
    Reported-by: Dries Van Puymbroeck <Dries.VanPuymbroeck@dekimo.com>
    Tested-by: Dries Van Puymbroeck <Dries.VanPuymbroeck@dekimo.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Michal Nazarewicz committed with gregkh Jun 25, 2010
  25. USB: musb: Enable the maximum supported burst mode for DMA

    Setting MUSB Burst Mode 3 automatically enables support for
    lower burst modes (BURST4, BURST8, BURST16 or bursts of unspecified
    length). There is no need to set these burst modes based on the
    packet size. Also enable the burst mode for both mode1 and mode0.
    
    This is a fix for buggy hardware - having the lower burst modes
    enabled can potentially cause lockups of the DMA engine used in
    OMAP2/3/4 chips.
    
    Signed-off-by: Hema HK <hemahk@ti.com>
    Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
    Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
    Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Hema HK committed with gregkh Jun 24, 2010
  26. USB: musb: fix Blackfin ulpi stubs

    The new ulpi code defines fallback stubs for the Blackfin arch, but does
    so incorrectly leading to a build failure:
    drivers/usb/musb/musb_core.c:227: error: 'musb_ulpi_read' undeclared here (not in a function)
    drivers/usb/musb/musb_core.c:228: error: 'musb_ulpi_write' undeclared here (not in a function)
    
    Tweak the fallback stubs so that they do work as intended.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
    Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    vapier committed with gregkh Jun 24, 2010
  27. USB: MUSB: make non-OMAP platforms build with CONFIG_PM=y

    Attempt to build MUSB driver with CONFIG_PM=y (e.g. in the OTG mode) on DaVinci
    results in these link errors:
    
    drivers/built-in.o: In function `musb_restore_context':
    led-triggers.c:(.text+0x714d8): undefined reference to
    `musb_platform_restore_context'
    drivers/built-in.o: In function `musb_save_context':
    led-triggers.c:(.text+0x71788): undefined reference to
    `musb_platform_save_context'
    
    This turned out to be caused by commit 9957dd9
    (usb: musb: Fix compile error for omaps for musb_hdrc). Revert it, taking into
    account the rename of CONFIG_ARCH_OMAP34XX into CONFIG_ARCH_OMAP3 (which that
    commit fixed in a completely inappropriate way) and the recent addition of
    OMAP4 support.
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
    Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Sergei Shtylyov committed with gregkh Jun 24, 2010
  28. USB: musb_core: make disconnect and suspend interrupts work again

    Commit 1c25fda (usb: musb: handle irqs in the
    order dictated by programming guide) forgot to get rid of the old 'STAGE0_MASK'
    filter for calling musb_stage0_irq(), so now disconnect and suspend interrupts
    are effectively ignored...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
    Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Sergei Shtylyov committed with gregkh Jun 24, 2010
  29. USB: obey the sysfs power/wakeup setting

    This patch (as1403) is a partial reversion of an earlier change
    (commit 5f677f1 "USB: fix remote
    wakeup settings during system sleep").  After hearing from a user, I
    realized that remote wakeup should be enabled during system sleep
    whenever userspace allows it, and not only if a driver requests it
    too.
    
    Indeed, there could be a device with no driver, that does nothing but
    generate a wakeup request when the user presses a button.  Such a
    device should be allowed to do its job.
    
    The problem fixed by the earlier patch -- device generating a wakeup
    request for no reason, causing system suspend to abort -- was also
    addressed by a later patch ("USB: don't enable remote wakeup by
    default", accepted but not yet merged into mainline).  The device
    won't be able to generate the bogus wakeup requests because it will be
    disabled for remote wakeup by default.  Hence this reversion will not
    re-introduce any old problems.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Cc: stable <stable@kernel.org> [.34]
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with gregkh Jun 22, 2010
  30. USB: gadget eth: Fix calculate CRC32 in EEM

    CRC should be calculated for Ethernet frame, not for whole recievede EEM data.
    This bug shows rarely, because in many times len == skb->len.
    
    Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Jiri Pinkava committed with gregkh Jun 20, 2010
  31. USB: qcserial: fix a memory leak in qcprobe error path

    This patch adds missing kfree(data) before return -ENODEV.
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    AxelLin committed with gregkh Jun 21, 2010
  32. USB: gadget/printer, fix sleep inside atomic

    Stanse found that sleep is called inside atomic context created by
    lock_printer_io spinlock in several functions. It's used in process
    context only and some functions sleep inside its critical section. As
    this is not allowed for spinlocks, switch it to mutex.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Craig W. Nadler <craig@nadler.us>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Jiri Slaby committed with gregkh Jun 21, 2010
  33. USB: isp1362-hcd, fix double lock

    Stanse found that isp1362_sw_reset tries to take a isp1362_hcd->lock,
    but it is already held in isp1362_hc_stop. Avoid that by introducing
    __isp1362_sw_reset which doesn't take the lock and call it from
    isp1362_hc_stop. isp1362_sw_reset is then as simple as lock --
    __isp1362_sw_reset -- unlock.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Lothar Wassmann <LW@KARO-electronics.de>
    Cc: Michael Hennerich <michael.hennerich@analog.com>
    Cc: Bryan Wu <cooloney@kernel.org>
    Cc: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Jiri Slaby committed with gregkh Jun 21, 2010
  34. USB: serial: ftdi: correct merge conflict with CONTEC id

    This patch corrects a problem with the merge of a previous
    patch to add the CONTEC identifier.
    
    I believe the merge problem occurred with the commit:
    dee5658
    
    Originally I submitted a patch and then they asked me to order the IDs
    and resubmit, so did I. But unfortunately in the end somehow both
    patches were merged.
    
    Signed-off-by: Daniel Sangorrin <daniel.sangorrin@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    sangorrin committed with gregkh Jun 18, 2010
  35. USB: fix oops in usb_sg_init()

    This patch (as1401) fixes a bug in usb_sg_init() that can cause an
    invalid pointer dereference.  An inner loop reuses some local variables
    in an unsafe manner, so new variables are introduced.
    
    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Tested-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Alan Stern committed with gregkh Jun 18, 2010