git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'egalax' into for-linus
[pandora-kernel.git]
/
drivers
/
staging
/
vme
/
bridges
/
vme_tsi148.c
diff --git
a/drivers/staging/vme/bridges/vme_tsi148.c
b/drivers/staging/vme/bridges/vme_tsi148.c
index
68f2442
..
783051f
100644
(file)
--- 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");
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;
dev_err(&pdev->dev, "CR/CSR configuration failed.\n");
goto err_crcsr;
+ }
retval = vme_register_bridge(tsi148_bridge);
if (retval != 0) {
retval = vme_register_bridge(tsi148_bridge);
if (retval != 0) {