diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-06-18 21:09:42 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-06-18 16:11:57 +0200 |
| commit | 1389fd03b7ff72625cdae5cc3f838ce093661200 (patch) | |
| tree | 1722dbf7ceb445504aa66e898fdf83a7222b433d /sound/firewire | |
| parent | 53b434f09340db8ad59b43789b7c43f54171fe36 (diff) | |
| download | blackbird-op-linux-1389fd03b7ff72625cdae5cc3f838ce093661200.tar.gz blackbird-op-linux-1389fd03b7ff72625cdae5cc3f838ce093661200.zip | |
ALSA: firewire: fix error return code in scs_probe()
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@trendmicro.com.cn>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/scs1x.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c index 844a555c3b1e..b252c21b6d13 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; |
