X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmessage%2Fi2o%2Fi2o_core.c;h=b631a62bd8050ad75ef01d4c3bf4e57a16faa442;hb=89d192394c0ea1b5d433957770a47418e56acf92;hp=66fa24b3f7a28b59975b3a51397e95253c82ff0e;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/message/i2o/i2o_core.c b/drivers/message/i2o/i2o_core.c
index 66fa24b3f..b631a62bd 100644
--- a/drivers/message/i2o/i2o_core.c
+++ b/drivers/message/i2o/i2o_core.c
@@ -831,14 +831,12 @@ static int i2o_issue_claim(u32 cmd, struct i2o_controller *c, int tid, u32 type)
  
 int i2o_claim_device(struct i2o_device *d, struct i2o_handler *h)
 {
-	int ret = 0;
-
 	down(&i2o_configuration_lock);
 	if (d->owner) {
 		printk(KERN_INFO "Device claim called, but dev already owned by %s!",
 		       h->name);
-		ret = -EBUSY;
-		goto out;
+		up(&i2o_configuration_lock);
+		return -EBUSY;
 	}
 	d->owner=h;
 
@@ -846,11 +844,10 @@ int i2o_claim_device(struct i2o_device *d, struct i2o_handler *h)
 			   I2O_CLAIM_PRIMARY))
 	{
 		d->owner = NULL;
-		ret = -EBUSY;
+		return -EBUSY;
 	}
-out:
 	up(&i2o_configuration_lock);
-	return ret;
+	return 0;
 }
 
 /**