Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

[linux-2.6] / drivers / scsi / sata_qstor.c

diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 029c2482e12770bca69a5ef53b6572d8825526aa..ffcdeb68641cf5a2493abf7be5b68b1da32f329c 100644 (file)
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -494,7 +494,7 @@ static int qs_port_start(struct ata_port *ap)
        if (rc)
                return rc;
        qs_enter_reg_mode(ap);
-       pp = kcalloc(1, sizeof(*pp), GFP_KERNEL);
+       pp = kzalloc(sizeof(*pp), GFP_KERNEL);
        if (!pp) {
                rc = -ENOMEM;
                goto err_out;