diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-08-04 13:24:41 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-08-04 13:24:41 +0930 |
| commit | b916113d820adc856aad6b8ebc1a25403ff7f293 (patch) | |
| tree | abddf239d912c4868faf9fbc69c67d980f74c7df /sound/pci/echoaudio/echoaudio.c | |
| parent | 2e4db6c6be91ade074c1a150a6db2aeb4920e25c (diff) | |
| parent | b05965f284db3e086022f4e318e46cb5bffb1376 (diff) | |
| download | talos-obmc-linux-openbmc-4.4-20160804-1.tar.gz talos-obmc-linux-openbmc-4.4-20160804-1.zip | |
Merge tag 'v4.4.16' into dev-4.4openbmc-4.4-20160804-1
This is the 4.4.16 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'sound/pci/echoaudio/echoaudio.c')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 1cb85aeb0cea..286f5e3686a3 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2200,11 +2200,11 @@ static int snd_echo_resume(struct device *dev) u32 pipe_alloc_mask; int err; - commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL); + commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL); if (commpage_bak == NULL) return -ENOMEM; commpage = chip->comm_page; - memcpy(commpage_bak, commpage, sizeof(struct comm_page)); + memcpy(commpage_bak, commpage, sizeof(*commpage)); err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device); if (err < 0) { |
