From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Wed, 22 Aug 2007 11:51:36 +0000 (+0200)
Subject: [S390] cio: dont forget to set last slot to NULL in ccw_uevent().
X-Git-Tag: v2.6.23-rc4~93^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3520c92283bb7ddd59daf90cfc1eb107dc9ab76c;p=linux-2.6

[S390] cio: dont forget to set last slot to NULL in ccw_uevent().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 297659fa0e..e44d92eac8 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -117,7 +117,10 @@ static int ccw_uevent(struct device *dev, char **envp, int num_envp,
 	snprint_alias(modalias_buf, sizeof(modalias_buf), id, "");
 	ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len,
 			     "MODALIAS=%s", modalias_buf);
-	return ret;
+	if (ret)
+		return ret;
+	envp[i] = NULL;
+	return 0;
 }
 
 struct bus_type ccw_bus_type;