From e1dd9069076cff136bee1c7bde8cf83b57d29722 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Sat, 3 Sep 2005 15:57:29 -0700
Subject: [PATCH] --- yaml --- r: 7027 b: refs/heads/master c:
 ec7cf783dd6cf5c8fb6b6767560686ed28d1cd6d h: refs/heads/master i:   7025:
 acc757862cd5067b8ac1b99eab7c295e518a6dd8   7023:
 cf6a3974016e7be82a85a2317cd1d739b2cfe6f1 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/um/drivers/ubd_kern.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3d43481e5ccf..4751339b2b4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7efd08c85523f9468a6a8748d6f02b3e73967569
+refs/heads/master: ec7cf783dd6cf5c8fb6b6767560686ed28d1cd6d
diff --git a/trunk/arch/um/drivers/ubd_kern.c b/trunk/arch/um/drivers/ubd_kern.c
index 344b24d09a7c..f73134333f64 100644
--- a/trunk/arch/um/drivers/ubd_kern.c
+++ b/trunk/arch/um/drivers/ubd_kern.c
@@ -668,21 +668,22 @@ static int ubd_add(int n)
 	struct ubd *dev = &ubd_dev[n];
 	int err;
 
+	err = -ENODEV;
 	if(dev->file == NULL)
-		return(-ENODEV);
+		goto out;
 
 	if (ubd_open_dev(dev))
-		return(-ENODEV);
+		goto out;
 
 	err = ubd_file_size(dev, &dev->size);
 	if(err < 0)
-		return(err);
+		goto out_close;
 
 	dev->size = ROUND_BLOCK(dev->size);
 
 	err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]);
 	if(err) 
-		return(err);
+		goto out_close;
  
 	if(fake_major != MAJOR_NR)
 		ubd_new_disk(fake_major, dev->size, n, 
@@ -693,8 +694,11 @@ static int ubd_add(int n)
 	if (fake_ide)
 		make_ide_entries(ubd_gendisk[n]->disk_name);
 
+	err = 0;
+out_close:
 	ubd_close(dev);
-	return 0;
+out:
+	return err;
 }
 
 static int ubd_config(char *str)