diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 10:16:55 -0700 |
| commit | be1066bbcd443a65df312fdecea7e4959adedb45 (patch) | |
| tree | e00904878d65c4a60195f9e26eb3a0481484c225 /drivers/staging/vme/bridges/vme_tsi148.c | |
| parent | 87156d692afdc4c689e99380a263445217a4b76c (diff) | |
| parent | 4839737b3b6af2a9b3b960584f08177fbc9bf118 (diff) | |
| download | op-kernel-dev-be1066bbcd443a65df312fdecea7e4959adedb45.zip op-kernel-dev-be1066bbcd443a65df312fdecea7e4959adedb45.tar.gz | |
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.
Diffstat (limited to 'drivers/staging/vme/bridges/vme_tsi148.c')
| -rw-r--r-- | drivers/staging/vme/bridges/vme_tsi148.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index 68f2442..783051f 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c @@ -2455,9 +2455,10 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) dev_info(&pdev->dev, "VME Write and flush and error check is %s\n", err_chk ? "enabled" : "disabled"); - if (tsi148_crcsr_init(tsi148_bridge, pdev)) + if (tsi148_crcsr_init(tsi148_bridge, pdev)) { dev_err(&pdev->dev, "CR/CSR configuration failed.\n"); goto err_crcsr; + } retval = vme_register_bridge(tsi148_bridge); if (retval != 0) { |
