summaryrefslogtreecommitdiffstats
path: root/drivers/vme
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-06-19 10:42:35 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 16:23:25 -0700
commit0686ab7a7d05cda3373e311a49b2478bd4f03c5d (patch)
treeb1eef9b7ae019f3cc2a7e740e254ba3950cd4dc6 /drivers/vme
parent4640a3f2bff64b808bdedadcddf882aa4606f374 (diff)
downloadlinux-stable-0686ab7a7d05cda3373e311a49b2478bd4f03c5d.tar.gz
linux-stable-0686ab7a7d05cda3373e311a49b2478bd4f03c5d.tar.bz2
linux-stable-0686ab7a7d05cda3373e311a49b2478bd4f03c5d.zip
vme: vme_tsi148.c: fix error return code in tsi148_probe()
Fix to return a negative error code in the tsi148_crcsr_init() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/vme')
-rw-r--r--drivers/vme/bridges/vme_tsi148.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
index 0bb512cfad77..94c892f27be4 100644
--- a/drivers/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -2582,7 +2582,8 @@ 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)) {
+ retval = tsi148_crcsr_init(tsi148_bridge, pdev);
+ if (retval) {
dev_err(&pdev->dev, "CR/CSR configuration failed.\n");
goto err_crcsr;
}