diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 08:47:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 08:47:46 -0700 |
| commit | 6eafa4604cfa109a89524d35d93df11c37bd66b0 (patch) | |
| tree | de0eddca052ed01318df559d7cd80211dd57a0fd /drivers/staging/tidspbridge | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | b9c4decbd9530b0c4c6dc4ad0626af628b79cd53 (diff) | |
| download | linux-3.10-6eafa4604cfa109a89524d35d93df11c37bd66b0.tar.gz linux-3.10-6eafa4604cfa109a89524d35d93df11c37bd66b0.tar.bz2 linux-3.10-6eafa4604cfa109a89524d35d93df11c37bd66b0.zip | |
Merge 3.1-rc4 into staging-next
This resolves a conflict with:
drivers/staging/brcm80211/brcmsmac/types.h
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge')
| -rw-r--r-- | drivers/staging/tidspbridge/gen/gh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/tidspbridge/gen/gh.c b/drivers/staging/tidspbridge/gen/gh.c index cd725033f27..60aa7b063c9 100644 --- a/drivers/staging/tidspbridge/gen/gh.c +++ b/drivers/staging/tidspbridge/gen/gh.c @@ -55,7 +55,7 @@ struct gh_t_hash_tab *gh_create(u16 max_bucket, u16 val_size, hash_tab->match = match; hash_tab->delete = delete == NULL ? noop : delete; - hash_tab->buckets = (struct element **) + hash_tab->buckets = kzalloc(sizeof(struct element *) * max_bucket, GFP_KERNEL); if (hash_tab->buckets == NULL) { gh_delete(hash_tab); |