Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / zorro / zorro.c

diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 67fa900..8eeb84c 100644 (file)
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -138,8 +138,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
        int error;
 
        /* Initialize the Zorro bus */
-       bus = kzalloc(sizeof(*bus) +
-                     zorro_num_autocon * sizeof(bus->devices[0]),
+       bus = kzalloc(struct_size(bus, devices, zorro_num_autocon),
                      GFP_KERNEL);
        if (!bus)
                return -ENOMEM;