diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 15:00:22 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 15:00:22 +0000 |
commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
tree | daada742542518b02d7db7c5d32e715eaa5f166d /drivers/uwb/est.c | |
parent | ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format (diff) | |
parent | Merge branch 'akpm' (aka "Andrew's patch-bomb, take two") (diff) | |
download | linux-dev-4de3a8e101150feaefa1139611a50ff37467f33e.tar.xz linux-dev-4de3a8e101150feaefa1139611a50ff37467f33e.zip |
Merge branch 'master' into fixes
Diffstat (limited to 'drivers/uwb/est.c')
-rw-r--r-- | drivers/uwb/est.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c index de81ebf51784..86ed7e61e597 100644 --- a/drivers/uwb/est.c +++ b/drivers/uwb/est.c @@ -184,7 +184,7 @@ int uwb_est_create(void) uwb_est_size = 2; uwb_est_used = 0; - uwb_est = kzalloc(uwb_est_size * sizeof(uwb_est[0]), GFP_KERNEL); + uwb_est = kcalloc(uwb_est_size, sizeof(uwb_est[0]), GFP_KERNEL); if (uwb_est == NULL) return -ENOMEM; |