summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorWilliam Lai <b04597@freescale.com>2009-11-25 13:48:41 +0800
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-02-12 17:19:38 +0100
commit2465cfa22089ab0c6d2d30cbe097e4594c139b08 (patch)
treeb118930e71a926acb5a7c0d557d074457c472924 /sound
parent1f4fc5cadfab8baf41208129dea9ae002f3d3cc9 (diff)
ENGR00118736 Mx35 ASoc: Trying to free already-free IRQ 240
Trying to free already-free IRQ 240 causes the warning dumped out when boot up the kernel. Return the error code in the probe function, which indicats the failure of the platform driver probing. Then the platform driver remove function will not be called, avoiding of freeing an already-free IRQ again. Signed-off-by: William Lai <b04597@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/imx/imx-3stack-ak4647.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/imx/imx-3stack-ak4647.c b/sound/soc/imx/imx-3stack-ak4647.c
index fd595c137522..e81a0128d22b 100644
--- a/sound/soc/imx/imx-3stack-ak4647.c
+++ b/sound/soc/imx/imx-3stack-ak4647.c
@@ -367,9 +367,9 @@ static int __init imx_3stack_ak4647_probe(struct platform_device *pdev)
gpio_activate_audio_ports();
imx_3stack_init_dam(dev_data->src_port, dev_data->ext_port);
- if (request_irq
- (dev_data->intr_id_hp, imx_headphone_detect_handler, 0,
- "headphone", NULL))
+ ret = request_irq(dev_data->intr_id_hp, imx_headphone_detect_handler, 0,
+ "headphone", NULL);
+ if (ret < 0)
goto err;
ret = driver_create_file(pdev->dev.driver, &driver_attr_headphone);