* [PATCH 12/15] pci: riptide: check kzalloc() result
@ 2010-07-16 16:15 Kulikov Vasiliy
2010-07-19 16:00 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-07-16 16:15 UTC (permalink / raw)
To: kernel-janitors
Cc: Jaroslav Kysela, Takashi Iwai, Alexey Dobriyan, Dan Carpenter,
Andy Shevchenko, Roel Kluin, linux-kernel, alsa-devel
If kzalloc() fails exit with -ENOMEM.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 12/15] pci: riptide: check kzalloc() result
2010-07-16 16:15 [PATCH 12/15] pci: riptide: check kzalloc() result Kulikov Vasiliy
@ 2010-07-19 16:00 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-07-19 16:00 UTC (permalink / raw)
To: Kulikov Vasiliy
Cc: kernel-janitors, Jaroslav Kysela, Alexey Dobriyan, Dan Carpenter,
Andy Shevchenko, Roel Kluin, linux-kernel, alsa-devel
At Fri, 16 Jul 2010 20:15:59 +0400,
Kulikov Vasiliy wrote:
>
> If kzalloc() fails exit with -ENOMEM.
>
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-19 16:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-16 16:15 [PATCH 12/15] pci: riptide: check kzalloc() result Kulikov Vasiliy
2010-07-19 16:00 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®