From e05c27b9e4535e0d4497a2a0921fdbadeade1a9d Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sat, 10 Feb 2007 01:45:20 -0800
Subject: [PATCH] --- yaml --- r: 47539 b: refs/heads/master c:
 45257fa9a5070e4c0739af1f81848ad557472b40 h: refs/heads/master i:   47537:
 4a22e6fa7740905c0f63dd460b621acb2a0ed7e6   47535:
 c5b8431703c6bd0a536b6fd832e94768871694b9 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/char/mxser_new.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 725fd0e3211b..b51e7a36ea95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18b95576bc6b9ef9270ec778e1d545c0ca8bbbbb
+refs/heads/master: 45257fa9a5070e4c0739af1f81848ad557472b40
diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c
index 042d1381ff6f..f078ddf48b79 100644
--- a/trunk/drivers/char/mxser_new.c
+++ b/trunk/drivers/char/mxser_new.c
@@ -2403,9 +2403,8 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
 			brd->info->name, brd->irq);
 		/* We hold resources, we need to release them. */
 		mxser_release_res(brd, pdev, 0);
-		return retval;
 	}
-	return 0;
+	return retval;
 }
 
 static int __init mxser_get_ISA_conf(int cap, struct mxser_board *brd)
@@ -2590,8 +2589,9 @@ static int __devinit mxser_probe(struct pci_dev *pdev,
 	}
 
 	/* mxser_initbrd will hook ISR. */
-	if (mxser_initbrd(brd, pdev) < 0)
-		goto err_relvec;
+	retval = mxser_initbrd(brd, pdev);
+	if (retval)
+		goto err_null;
 
 	for (i = 0; i < brd->info->nports; i++)
 		tty_register_device(mxvar_sdriver, brd->idx + i, &pdev->dev);
@@ -2599,10 +2599,9 @@ static int __devinit mxser_probe(struct pci_dev *pdev,
 	pci_set_drvdata(pdev, brd);
 
 	return 0;
-err_relvec:
-	pci_release_region(pdev, 3);
 err_relio:
 	pci_release_region(pdev, 2);
+err_null:
 	brd->info = NULL;
 err:
 	return retval;
@@ -2620,6 +2619,7 @@ static void __devexit mxser_remove(struct pci_dev *pdev)
 		tty_unregister_device(mxvar_sdriver, brd->idx + i);
 
 	mxser_release_res(brd, pdev, 1);
+	brd->info = NULL;
 }
 
 static struct pci_driver mxser_driver = {