summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2007-08-22 13:51:36 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-08-22 13:51:46 +0200
commit3520c92283bb7ddd59daf90cfc1eb107dc9ab76c (patch)
treeadbbb0b692b0b72238f5aced37a51e4a06d69d0d /drivers/s390
parentfix - ensure we don't use bootconsoles after init has been released (diff)
downloadlinux-3520c92283bb7ddd59daf90cfc1eb107dc9ab76c.tar.xz
linux-3520c92283bb7ddd59daf90cfc1eb107dc9ab76c.zip
[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>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/device.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 297659fa0e26..e44d92eac8e9 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;