aboutsummaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)AuthorFilesLines
2010-05-19Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entryBen Dooks1-2/+2
Make the driver depend on either ARCH_S3C2410 (as legacy) or the new device selection of SAMSUNG_DEV_TS. Change the menuconfig name to reflect this driver is now handling more devices that just the s3c2410. Signed-off-by: Ben Dooks <[email protected]> Acked-by: Dmitry Torokhov <[email protected]>
2010-05-19Input: s3c24xx_ts - Add FEAT for Samsung touchscreen supportNaveen Krishna1-3/+12
This patch adds a feature bit field in the touchscreen driver for Samsung SoCs. Which can be used to distinguish the TSADC module features. Signed-off-by: Naveen Krishna Ch <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> [[email protected]: minor fix to title] Signed-off-by: Ben Dooks <[email protected]> Acked-by: Dmitry Torokhov <[email protected]>
2010-05-19Input: s3c24xx_ts - Implement generic GPIO configuration callbackNaveen Krishna1-20/+3
This patch implements generic GPIO configuration function in Samsung touchscreen driver. And makes the touchscreen driver s3c24xx-ts.c generic to all the Samsung SoCs. Signed-off-by: Naveen Krishna Ch <[email protected]> Signed-off-by: Kukjin Kim <[email protected]> [[email protected]: fixed title ] Signed-off-by: Ben Dooks <[email protected]> Acked-by: Dmitry Torokhov <[email protected]>
2010-05-19ARM: SAMSUNG: Move mach/ts.h to plat/ts.hMaurus Cuelenaere1-1/+1
This moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in order to prepare for s3c64xx support in the touchscreen driver. Signed-off-by: Maurus Cuelenaere <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-05-19drivers: serial: S5PC100 serial driver cleanupMarek Szyprowski2-13/+4
Remove unnecessary Kconfig entry. S5PC100 has exactly the same driver as S3C6400/S3C6410/S5P6440. Signed-off-by: Marek Szyprowski <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-05-06serial: Use s3c2440 driver for S3C2416 SoCYauhen Kharuzhy1-3/+4
UARTs in the S3C2416 are almost same as in S3C2443 and can be handled by s3c2440 serial driver. Signed-off-by: Yauhen Kharuzhy <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2010-05-04Merge branch 'drm-linus' of ↵Linus Torvalds14-47/+83
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/legacy: only enable load detection property on DVI-I drm/radeon/kms: fix panel scaling adjusted mode setup drivers/gpu/drm/drm_sysfs.c: sysfs files error handling drivers/gpu/drm/radeon/radeon_atombios.c: range check issues gpu: vga_switcheroo, fix lock imbalance drivers/gpu/drm/drm_memory.c: fix check for end of loop drivers/gpu/drm/via/via_video.c: fix off by one issue drm/radeon/kms/agp The wrong AGP chipset can cause a NULL pointer dereference drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill
2010-05-05drm/radeon/kms/legacy: only enable load detection property on DVI-IAlex Deucher1-0/+2
DVI-D doesn't have analog. This matches the avivo behavior. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-05drm/radeon/kms: fix panel scaling adjusted mode setupAlex Deucher3-22/+53
This should duplicate exactly what the ddx does for both legacy and avivo. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-04i2c-core: Use per-adapter userspace device listsJean Delvare1-16/+18
Using a single list for all userspace devices leads to a dead lock on multiplexed buses in some circumstances (mux chip instantiated from userspace). This is solved by using a separate list for each bus segment. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Michael Lawnick <[email protected]>
2010-05-04i2c: Fix probing of FSC hardware monitoring chipsJean Delvare1-5/+16
Some FSC hardware monitoring chips (Syleus at least) doesn't like quick writes we typically use to probe for I2C chips. Use a regular byte read instead for the address they live at (0x73). These are the only known chips living at this address on PC systems. For clarity, this fix should not be needed for kernels 2.6.30 and later, as we started instantiating the hwmon devices explicitly based on DMI data. Still, this fix is valuable in the following two cases: * Support for recent FSC chips on older kernels. The DMI-based device instantiation is more difficult to backport than the device support itself. * Case where the DMI-based device instantiation fails, whatever the reason. We fall back to probing in that case, so it should work. This fixes kernel bug #15634: https://bugzilla.kernel.org/show_bug.cgi?id=15634 Signed-off-by: Jean Delvare <[email protected]> Acked-by: Hans de Goede <[email protected]> Cc: [email protected]
2010-05-04i2c-core: Erase pointer to clientdata on removalWolfram Sang1-2/+6
After discovering that a lot of i2c-drivers leave the pointer to their clientdata dangling, it was decided to let the core handle this issue. It is assumed that the core may access the private data after remove() as there are no guarantees for the lifetime of such pointers anyhow (see thread starting at http://lkml.org/lkml/2010/3/21/68) Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2010-05-03Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds1-1/+1
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.
2010-05-03watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.Wim Van Sebroeck1-1/+1
The WATCHDOG_TIMEOUT macro does not exist. The default timeout value is WDT_TIMEOUT. Fix the MODULE_PARM_DESC so that the code can compile again. reported-by: Randy Dunlap <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
2010-04-30Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds5-14/+26
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (27 commits) MIPS: Loongson 2F: Fix of problems introduced by -mfix-loongson2f-jump MIPS: Loongson-2F: Use CONFIG_CPU_JUMP_WORKAROUNDS to control workarounds. MIPS: Loongson 2F: Enable fixups of the latest binutils MIPS: Loongson: Add CPU_LOONGSON2F_WORKAROUNDS MIPS: Kconfig: Make Broadcom SoC support naming consistent MIPS: BCM63xx: Update defconfig MIPS: oprofile: Fix breakage when CONFIG_OPROFILE=m STAGING: octeon-ethernet: Use proper phy addresses for Movidis hardware. NET: mdio-octeon: Enable the hardware before using it. I2C: Fix section mismatch errors in i2c-octeon.c MIPS: Loongson: Fix LOONGSON_ADDRWIN_CFG macro. MIPS: Loongson: Fix phys_mem_access_prot() check MIPS: Loongson: Fix find_vga_mem_init() MIPS: Loongson: Fix typo in gdium mach type string. MIPS: Use CKSEG1ADDR for uncached handler MIPS: Check for accesses beyond the end of the PGD. MIPS: Use uasm_i_ds{r,l}l_safe() instead of uasm_i_ds{r,l}l() in tlbex.c MIPS: Add uasm_i_dsrl_safe() and uasm_i_dsll_safe() to uasm. MIPS: die() does not call die notifier chain MIPS: Swarm, Littlesur: Enable PATA platform driver. ...
2010-04-30STAGING: octeon-ethernet: Use proper phy addresses for Movidis hardware.David Daney1-0/+8
Signed-off-by: David Daney <[email protected]> To: [email protected] To: [email protected] To: [email protected] Patchwork: http://patchwork.linux-mips.org/patch/1091/ Acked-by: David S. Miller <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Ralf Baechle <[email protected]>
2010-04-30NET: mdio-octeon: Enable the hardware before using it.David Daney1-0/+10
In some cases the mdio bus is not enabled at the time of probing. This prevents anything from working, so we will enable it before trying to use it, and disable it when the driver is removed. Signed-off-by: David Daney <[email protected]> To: [email protected] To: [email protected] To: [email protected] Patchwork: http://patchwork.linux-mips.org/patch/1090/ Acked-by: David S. Miller <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Ralf Baechle <[email protected]>
2010-04-30I2C: Fix section mismatch errors in i2c-octeon.cDavid Daney1-2/+2
Signed-off-by: David Daney <[email protected]> To: [email protected] To: [email protected] To: [email protected] Cc: [email protected] Cc: [email protected] Patchwork: http://patchwork.linux-mips.org/patch/1037/ Signed-off-by: Ralf Baechle <[email protected]>
2010-04-30MIPS: DB1200: PCMCIA card detection must not be auto-enabled.Manuel Lauss1-12/+4
Same issues as SD card detection: One of both is always triggering and the handlers take care to shut it up and enable the other. To avoid messages about "unbalanced interrupt enable/disable" they must not be automatically enabled when initally requested. This was not an issue with the db1200_defconfig due to fortunate timings; on a build without network chip support the warnings appear. Signed-off-by: Manuel Lauss <[email protected]> To: Linux-MIPS <[email protected]> Patchwork: http://patchwork.linux-mips.org/patch/1133/ Signed-off-by: Ralf Baechle <[email protected]>
2010-04-30MIPS: TXx9: Add missing MODULE_ALIAS definitions for TXx9 platform devicesGeert Uytterhoeven1-0/+2
This enables autoloading of the TXx9 sound driver on RBTX4927. Signed-off-by: Geert Uytterhoeven <[email protected]> To: Atsushi Nemoto <[email protected]> Cc: Linux MIPS Mailing List <[email protected]> Patchwork: http://patchwork.linux-mips.org/patch/1101/ Signed-off-by: Ralf Baechle <[email protected]>
2010-04-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds14-9/+25
* 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.
2010-04-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds7-7/+21
* 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
2010-04-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds26-79/+190
* 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 ...
2010-04-30edac, mce: Fix wrong mask and macro usageBorislav Petkov1-3/+2
Correct two mishaps which prevented reporting error type (CECC vs UECC) and extended error description. Cc: <[email protected]> # 32.x, 33.x Signed-off-by: Borislav Petkov <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-30Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds5-40/+11
* '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
2010-04-30Staging: vme: Re-introduce necessary bracketsMartyn Welch1-1/+2
Somehow I managed to remove a set of rather necessary brackets in commit 29848ac9f3b33bf171439ae2d66d40e6a71446c4. Put them back. Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: iio: fix up the iio_get_new_idr_val commentAndrew Morton1-1/+1
improve the comment a bit Cc: Greg KH <[email protected]> Cc: Jonathan Cameron <[email protected]> Cc: Sonic Zhang <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: add Add Sitecom WL-349 to rtl8192suRodrigo Linfati1-0/+1
Add usb id of Sitecom WL-349 to rtl8192su Signed-off-by: Rodrigo Linfati <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device idChris Largret1-0/+1
Add Belkin F5D8055 Wireless-N USB support to the rt2870 staging driver. Signed-off-by: Chris Largret <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30staging: rtl8192su: add Support for Belkin F5D8053 v6Richard Airlie1-0/+1
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: dt3155: fix 50Hz configurationH Hartley Sweeten1-2/+2
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 <[email protected]> Cc: Simon Horman <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30staging: usbip: Fix deadlockEric Lescouet1-0/+3
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 <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: rtl8192su: add USB ID for 0bda:8171Pavel Roskin1-0/+1
Signed-off-by: Pavel Roskin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: hv: name network device ethX rather than sethXStephen Hemminger1-2/+1
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 <[email protected]> Cc: Hank Janssen <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: hv: Fix up memory leak on HvCleanupCyrill Gorcunov1-1/+1
Don't assign NULL too early Signed-off-by: Cyrill Gorcunov <[email protected]> Cc: Hank Janssen <[email protected]> Cc: Haiyang Zhang <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: hv: Fix a bug affecting IPv6Haiyang Zhang1-0/+1
Fix a bug affecting IPv6 Added the multicast flag for proper IPv6 function. Reported-by: Toshikazu Sakai <[email protected]> Signed-off-by: Hank Janssen <[email protected]> Signed-off-by: Haiyang Zhang <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30staging: iio: ring_sw: Fix incorrect test on successful read of last value, ↵Jonathan Cameron1-1/+1
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30staging: iio: Function iio_get_new_idr_val() return negative value if fails.Sonic Zhang1-1/+2
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 <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: iio: adc: fix dangling pointersWolfram Sang1-0/+2
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 <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: iio: light: fix dangling pointersWolfram Sang1-0/+2
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 <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30Staging: iio: test for failed allocationDan Carpenter1-0/+3
We should return test to see if iio_allocate_trigger() fails and return -ENOMEM. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30staging: iio: lis3l02dq - incorrect ws used in container of call.Jonathan Cameron1-1/+1
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: sl811-hcd: Fix device disconnectMichael Hennerich1-3/+3
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 <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: ohci-at91: fix power management hangingPatrice Vilchez1-0/+2
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 <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: rename usb_buffer_alloc() and usb_buffer_free()Daniel Mack1-10/+10
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 <[email protected]> Cc: Alan Stern <[email protected]> Cc: Pedro Ribeiro <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: ti_usb: fix printk format warningRandy Dunlap1-1/+1
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: gadget: s3c-hsotg: Add missing unlockJulia Lawall1-2/+5
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not setAnand Gadiyar1-1/+1
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 <[email protected]> CC: Michal Marek <[email protected]> CC: Tony Lindgren <[email protected]> CC: Alan Stern <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: oxu210hp: release spinlock on error pathDan Carpenter1-3/+3
Smatch complained about this missing spinlock. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-30USB: serial: option: add cinterion device idGreg Kroah-Hartman1-0/+3
This adds a device id for a Cinterion device. Reported-by: John Race <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>