Merge branch 'master' into devel-3.0

Conflicts:

	Incremental.c
	super0.c
	super1.c

1 files changed, 1 insertions, 1 deletions

diff --git a/mdopen.c b/mdopen.c
index 0b9498c..eee1eea 100644
--- a/mdopen.c
+++ b/mdopen.c
@@ -282,7 +282,7 @@ int open_mddev_devnum(char *devname, int devnum, char *name,
 
 	if (devname)
 		strcpy(chosen_name, devname);
-	else if (name && name[0] && strchr(name,'/') == NULL) {
+	else if (name && *name && name[0] && strchr(name,'/') == NULL) {
 		char *n = strchr(name, ':');
 		if (n) n++; else n = name;
 		if (isdigit(*n) && devnum < 0)