Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 190490
b: refs/heads/master
c: 4839737
h: refs/heads/master
v: v3
  • Loading branch information
Martyn Welch authored and Greg Kroah-Hartman committed Apr 30, 2010
1 parent 648b7bd commit b15da49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f3cdc28520a059feb8b5001655f01536ab1e0167
refs/heads/master: 4839737b3b6af2a9b3b960584f08177fbc9bf118
3 changes: 2 additions & 1 deletion trunk/drivers/staging/vme/bridges/vme_tsi148.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit b15da49

Please sign in to comment.