2010-07-16 16:16:21

by Kulikov Vasiliy

Subject: [PATCH 12/15] pci: riptide: check kzalloc() result

If kzalloc() fails exit with -ENOMEM.

Signed-off-by: Kulikov Vasiliy <[email protected]>
---
sound/pci/riptide/riptide.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 59d7996..f64fb7d 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1615,7 +1615,10 @@ static int snd_riptide_playback_open(struct snd_pcm_substream *substream)

chip->playback_substream[sub_num] = substream;
runtime->hw = snd_riptide_playback;
+
data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL);
+ if (data == NULL)
+ return -ENOMEM;
data->paths = lbus_play_paths[sub_num];
data->id = play_ids[sub_num];
data->source = play_sources[sub_num];
@@ -1635,7 +1638,10 @@ static int snd_riptide_capture_open(struct snd_pcm_substream *substream)

chip->capture_substream = substream;
runtime->hw = snd_riptide_capture;
+
data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL);
+ if (data == NULL)
+ return -ENOMEM;
data->paths = lbus_rec_path;
data->id = PADC;
data->source = ACLNK2PADC;
--
1.7.0.4

2010-07-19 16:00:32

by Takashi Iwai

Subject: Re: [PATCH 12/15] pci: riptide: check kzalloc() result

At Fri, 16 Jul 2010 20:15:59 +0400,
Kulikov Vasiliy wrote:
>
> If kzalloc() fails exit with -ENOMEM.
>
> Signed-off-by: Kulikov Vasiliy <[email protected]>

Thanks, applied now.


Takashi

> ---
> sound/pci/riptide/riptide.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
> index 59d7996..f64fb7d 100644
> --- a/sound/pci/riptide/riptide.c
> +++ b/sound/pci/riptide/riptide.c
> @@ -1615,7 +1615,10 @@ static int snd_riptide_playback_open(struct snd_pcm_substream *substream)
>
> chip->playback_substream[sub_num] = substream;
> runtime->hw = snd_riptide_playback;
> +
> data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL);
> + if (data == NULL)
> + return -ENOMEM;
> data->paths = lbus_play_paths[sub_num];
> data->id = play_ids[sub_num];
> data->source = play_sources[sub_num];
> @@ -1635,7 +1638,10 @@ static int snd_riptide_capture_open(struct snd_pcm_substream *substream)
>
> chip->capture_substream = substream;
> runtime->hw = snd_riptide_capture;
> +
> data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL);
> + if (data == NULL)
> + return -ENOMEM;
> data->paths = lbus_rec_path;
> data->id = PADC;
> data->source = ACLNK2PADC;
> --
> 1.7.0.4
>