lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml ubd driver: reformat ubd_config

Browse Source 
Pure whitespace and style fixes split out from subsequent patch.  Some changes
(err -> ret) don't make sense now, only later, but I split them out anyway
since they cluttered the patch.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso
2006-10-30 22:07:09 -08:00
committed by Linus Torvalds
parent 2fe30a34a1
commit e7f6552f23
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
arch/um/drivers/ubd_kern.c
View File

@@ -706,27 +706,36 @@ out:
static int ubd_config(char *str) static int ubd_config(char *str)
{ {
int n, err; int n, ret;
str = kstrdup(str, GFP_KERNEL); str = kstrdup(str, GFP_KERNEL);
if(str == NULL){ if (str == NULL) {
printk(KERN_ERR "ubd_config failed to strdup string\n"); printk(KERN_ERR "ubd_config failed to strdup string\n");
return(1); ret = 1;
goto out;
} }
err = ubd_setup_common(str, &n); ret = ubd_setup_common(str, &n);
if(err){ if (ret) {
kfree(str); ret = -1;
return(-1); goto err_free;
}
if (n == -1) {
ret = 0;
goto out;
} }
if(n == -1) return(0);
mutex_lock(&ubd_lock); mutex_lock(&ubd_lock);
err = ubd_add(n); ret = ubd_add(n);
if(err) if (ret)
ubd_devs[n].file = NULL; ubd_devs[n].file = NULL;
mutex_unlock(&ubd_lock); mutex_unlock(&ubd_lock);
return(err); out:
return ret;
err_free:
kfree(str);
goto out;
} }
static int ubd_get_config(char *name, char *str, int size, char **error_out) static int ubd_get_config(char *name, char *str, int size, char **error_out)