[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <s5h1u7zlczy.wl%tiwai@suse.de>
Date: Tue, 18 Jun 2013 16:17:21 +0200
From: Takashi Iwai <tiwai@...e.de>
To: Wei Yongjun <weiyj.lk@...il.com>
Cc: clemens@...isch.de, perex@...ex.cz, yongjun_wei@...ndmicro.com.cn,
alsa-devel@...a-project.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ALSA: firewire: fix error return code in scs_probe()
At Tue, 18 Jun 2013 21:09:42 +0800,
Wei Yongjun wrote:
>
> From: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
>
> Fix to return -ENOMEM in the kmalloc() error handling
> case instead of 0, as done elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
Thanks, applied with ack by Clemens.
Takashi
> ---
> sound/firewire/scs1x.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
> index 844a555..b252c21 100644
> --- a/sound/firewire/scs1x.c
> +++ b/sound/firewire/scs1x.c
> @@ -405,8 +405,10 @@ static int scs_probe(struct device *unit_dev)
> scs->output_idle = true;
>
> scs->buffer = kmalloc(HSS1394_MAX_PACKET_SIZE, GFP_KERNEL);
> - if (!scs->buffer)
> + if (!scs->buffer) {
> + err = -ENOMEM;
> goto err_card;
> + }
>
> scs->hss_handler.length = HSS1394_MAX_PACKET_SIZE;
> scs->hss_handler.address_callback = handle_hss;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists