---

yaml --- r: 119123 b: refs/heads/master c: 6a12afb h: refs/heads/master i: 119121: 1546b1d 119119: fce92d5 v: v3
git-mirror · Nov 13, 2008 · 5a74a1b · 5a74a1b
1 parent 2e1bc48
commit 5a74a1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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";