diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-10-04 08:52:58 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-10-04 08:53:06 +0300 |
| commit | 4a9a72e0db5e584267944f4d868f46419b2fab59 (patch) | |
| tree | 95e3b2f13e41cad37fdeff87ef5c1366bba39497 /sound/pci/emu10k1 | |
| parent | 2e75b676c3284930489a968d33b75e5d2b2c36c6 (diff) | |
| parent | 709ae62e8e6d9ac4df7dadb3b8ae432675c45ef9 (diff) | |
| download | linux-4a9a72e0db5e584267944f4d868f46419b2fab59.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge 4.19-devel branch into 4.20 for applying FireWire patches
cleanly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1')
| -rw-r--r-- | sound/pci/emu10k1/emufx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 90713741c2dc..6ebe817801ea 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c @@ -2540,7 +2540,7 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un emu->support_tlv = 1; return put_user(SNDRV_EMU10K1_VERSION, (int __user *)argp); case SNDRV_EMU10K1_IOCTL_INFO: - info = kmalloc(sizeof(*info), GFP_KERNEL); + info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; snd_emu10k1_fx8010_info(emu, info); |