Merge tag 'powerpc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

[linux.git] / drivers / macintosh / rack-meter.c

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 910b5b6f96b1439a5843b8b08aa81b86e6ca5e9b..1f29d2413c7400a9783b0e944f259dc62dfe399a 100644 (file)
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -154,8 +154,8 @@ static void rackmeter_do_pause(struct rackmeter *rm, int pause)
                DBDMA_DO_STOP(rm->dma_regs);
                return;
        }
-       memset(rdma->buf1, 0, ARRAY_SIZE(rdma->buf1));
-       memset(rdma->buf2, 0, ARRAY_SIZE(rdma->buf2));
+       memset(rdma->buf1, 0, sizeof(rdma->buf1));
+       memset(rdma->buf2, 0, sizeof(rdma->buf2));
 
        rm->dma_buf_v->mark = 0;
 
@@ -397,7 +397,7 @@ static int rackmeter_probe(struct macio_dev* mdev,
        }
 
        /* Create and initialize our instance data */
-       rm = kzalloc(sizeof(struct rackmeter), GFP_KERNEL);
+       rm = kzalloc(sizeof(*rm), GFP_KERNEL);
        if (rm == NULL) {
                printk(KERN_ERR "rackmeter: failed to allocate memory !\n");
                rc = -ENOMEM;