diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /drivers/dio/dio.c | |
parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/dio/dio.c')
-rw-r--r-- | drivers/dio/dio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index a620f7d9ac8e..17502d6efae7 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c | |||
@@ -224,11 +224,10 @@ static int __init dio_init(void) | |||
224 | set_fs(fs); | 224 | set_fs(fs); |
225 | 225 | ||
226 | /* Found a board, allocate it an entry in the list */ | 226 | /* Found a board, allocate it an entry in the list */ |
227 | dev = kmalloc(sizeof(struct dio_dev), GFP_KERNEL); | 227 | dev = kzalloc(sizeof(struct dio_dev), GFP_KERNEL); |
228 | if (!dev) | 228 | if (!dev) |
229 | return 0; | 229 | return 0; |
230 | 230 | ||
231 | memset(dev, 0, sizeof(struct dio_dev)); | ||
232 | dev->bus = &dio_bus; | 231 | dev->bus = &dio_bus; |
233 | dev->dev.parent = &dio_bus.dev; | 232 | dev->dev.parent = &dio_bus.dev; |
234 | dev->dev.bus = &dio_bus_type; | 233 | dev->dev.bus = &dio_bus_type; |