Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[deliverable/linux.git] / sound / pci / echoaudio / echoaudio.c

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 668a5ec044992f227f0f7cf37a61325ea5078549..20763dd03fa010f41e6bcd236cb296df02ca8b3b 100644 (file)
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -2250,6 +2250,8 @@ static int snd_echo_resume(struct pci_dev *pci)
        DE_INIT(("resume start\n"));
        pci_restore_state(pci);
        commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
+       if (commpage_bak == NULL)
+               return -ENOMEM;
        commpage = chip->comm_page;
        memcpy(commpage_bak, commpage, sizeof(struct comm_page));