From 5a74a1ba0aa589986d119b2478c312353945169f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 13 Nov 2008 13:08:56 +0100 Subject: [PATCH] --- yaml --- r: 119123 b: refs/heads/master c: 6a12afb5640217454cad21e8cf9a74b038fa3717 h: refs/heads/master i: 119121: 1546b1ddb401c72a7f900b18ac196cfdef9f414a 119119: fce92d5946bfc80571bd15e8e2d6dc4bdcb578ba v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_beep.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 613418fdfc10..7b5397699071 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d4e9bb339cfcde7811af10859ba1ce2fe3d46b4 +refs/heads/master: 6a12afb5640217454cad21e8cf9a74b038fa3717 diff --git a/trunk/sound/pci/hda/hda_beep.c b/trunk/sound/pci/hda/hda_beep.c index b1796ae1e8fb..3ecd7e797dee 100644 --- a/trunk/sound/pci/hda/hda_beep.c +++ b/trunk/sound/pci/hda/hda_beep.c @@ -88,6 +88,10 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid) snprintf(beep->phys, sizeof(beep->phys), "card%d/codec#%d/beep0", codec->bus->card->number, codec->addr); input_dev = input_allocate_device(); + if (!input_dev) { + kfree(beep); + return -ENOMEM; + } /* setup digital beep device */ input_dev->name = "HDA Digital PCBeep";