aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r--drivers/sbus/char/bbc_i2c.c3
-rw-r--r--drivers/sbus/char/vfc_dev.c5
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 178155bf9db6..fbadd4d761f3 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -156,10 +156,9 @@ struct bbc_i2c_client *bbc_i2c_attach(struct linux_ebus_child *echild)
156 156
157 if (!bp) 157 if (!bp)
158 return NULL; 158 return NULL;
159 client = kmalloc(sizeof(*client), GFP_KERNEL); 159 client = kzalloc(sizeof(*client), GFP_KERNEL);
160 if (!client) 160 if (!client)
161 return NULL; 161 return NULL;
162 memset(client, 0, sizeof(*client));
163 client->bp = bp; 162 client->bp = bp;
164 client->echild = echild; 163 client->echild = echild;
165 client->bus = echild->resource[0].start; 164 client->bus = echild->resource[0].start;
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 6afc7e5df0d4..26b1d2a17ed2 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -656,12 +656,9 @@ static int vfc_probe(void)
656 if (!cards) 656 if (!cards)
657 return -ENODEV; 657 return -ENODEV;
658 658
659 vfc_dev_lst = kmalloc(sizeof(struct vfc_dev *) * 659 vfc_dev_lst = kcalloc(cards + 1, sizeof(struct vfc_dev*), GFP_KERNEL);
660 (cards+1),
661 GFP_KERNEL);
662 if (vfc_dev_lst == NULL) 660 if (vfc_dev_lst == NULL)
663 return -ENOMEM; 661 return -ENOMEM;
664 memset(vfc_dev_lst, 0, sizeof(struct vfc_dev *) * (cards + 1));
665 vfc_dev_lst[cards] = NULL; 662 vfc_dev_lst[cards] = NULL;
666 663
667 ret = register_chrdev(VFC_MAJOR, vfcstr, &vfc_fops); 664 ret = register_chrdev(VFC_MAJOR, vfcstr, &vfc_fops);