diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 06:05:40 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 06:05:40 -0500 |
| commit | 1f26cb92a28541da1c9b27571e40b08333595773 (patch) | |
| tree | 90e9c7f7fe9bdccc6cd356afcf3977af256c9a21 /sound/pci | |
| parent | 2c3b9b50db5fe8d6039dfdfc44202fcd49eb9d00 (diff) | |
| parent | db8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b (diff) | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0877bae5dae1..c7465053d6bb 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -12924,7 +12924,7 @@ static int patch_alc268(struct hda_codec *codec) | |||
| 12924 | int board_config; | 12924 | int board_config; |
| 12925 | int i, has_beep, err; | 12925 | int i, has_beep, err; |
| 12926 | 12926 | ||
| 12927 | spec = kcalloc(1, sizeof(*spec), GFP_KERNEL); | 12927 | spec = kzalloc(sizeof(*spec), GFP_KERNEL); |
| 12928 | if (spec == NULL) | 12928 | if (spec == NULL) |
| 12929 | return -ENOMEM; | 12929 | return -ENOMEM; |
| 12930 | 12930 | ||