diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-08-31 16:25:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-08-31 16:25:22 +0200 |
commit | 08ceab9d875824f8b389530e830349d5d6c4e582 (patch) | |
tree | 4ced69544742b87cb369de553df505870be593e1 /drivers/md/md.c | |
parent | ALSA: fireworks/bebob/dice/oxfw: fix substreams counting at vmalloc failure (diff) | |
parent | Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and '... (diff) | |
download | linux-08ceab9d875824f8b389530e830349d5d6c4e582.tar.xz linux-08ceab9d875824f8b389530e830349d5d6c4e582.zip |
Merge tag 'asoc-v4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.3
Not many updates to the core here, but an awful lot of driver updates
this time round:
- Factoring out of AC'97 reset code into the core
- New drivers for Cirrus CS4349, GTM601, InvenSense ICS43432, Realtek
RT298 and ST STI controllers.
- Machine drivers for Rockchip systems with MAX98090 and RT5645 and
RT5650.
- Initial driver support for Intel Skylake devices.
- A large number of cleanups for Lars-Peter Clausen and Axel Lin.
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 0c2a4e8b873c..e25f00f0138a 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5759,7 +5759,7 @@ static int get_bitmap_file(struct mddev *mddev, void __user * arg) char *ptr; int err; - file = kmalloc(sizeof(*file), GFP_NOIO); + file = kzalloc(sizeof(*file), GFP_NOIO); if (!file) return -ENOMEM; |