Skip to contentSkip to conversation

ASoC: samsung: Fix checking return value of clk_get

PATCH Applied Axel Lin 2 participants 2 messages Sep 15, 2011

Subsystems (3)
Sound ASoC Samsung audio (ASoC) drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 ASoC: samsung: Fix checking return value of clk_get

clk_get() returns a pointer to the struct clk or an ERR_PTR(). This patch also use PTR_ERR() for return value.

Signed-off-by Axel Lin <[email protected]>
Cc Christian Pellegrin <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Sangbeom Kim <[email protected]>
Cc Jassi Brar <[email protected]>
Acked-by Liam Girdwood <[email protected]>

---
v2: Also use PTR_ERR() for return value.

 sound/soc/samsung/s3c2412-i2s.c     |    4 ++--
 sound/soc/samsung/s3c24xx-i2s.c     |    4 ++--
 sound/soc/samsung/s3c24xx_uda134x.c |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
sound/soc/samsung/s3c2412-i2s.c +2 -2
index 841ab14..7ab8e2c 100644
@@ -69,10 +69,10 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
 	s3c2412_i2s.dma_playback = &s3c2412_i2s_pcm_stereo_out;
 
 	s3c2412_i2s.iis_cclk = clk_get(dai->dev, "i2sclk");
-	if (s3c2412_i2s.iis_cclk == NULL) {
+	if (IS_ERR(s3c2412_i2s.iis_cclk)) {
 		pr_err("failed to get i2sclk clock\n");
 		iounmap(s3c2412_i2s.regs);
-		return -ENODEV;
+		return PTR_ERR(s3c2412_i2s.iis_cclk);
 	}
 
 	/* Set MPLL as the source for IIS CLK */
sound/soc/samsung/s3c24xx-i2s.c +2 -2
index 63d8849..21c92e2 100644
@@ -383,10 +383,10 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)
 		return -ENXIO;
 
 	s3c24xx_i2s.iis_clk = clk_get(dai->dev, "iis");
-	if (s3c24xx_i2s.iis_clk == NULL) {
+	if (IS_ERR(s3c24xx_i2s.iis_clk)) {
 		pr_err("failed to get iis_clock\n");
 		iounmap(s3c24xx_i2s.regs);
-		return -ENODEV;
+		return PTR_ERR(s3c24xx_i2s.iis_clk);
 	}
 	clk_enable(s3c24xx_i2s.iis_clk);
sound/soc/samsung/s3c24xx_uda134x.c +4 -4
index dc9d551..65c1cfd 100644
@@ -66,17 +66,17 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream)
 	pr_debug("%s %d\n", __func__, clk_users);
 	if (clk_users == 0) {
 		xtal = clk_get(&s3c24xx_uda134x_snd_device->dev, "xtal");
-		if (!xtal) {
+		if (IS_ERR(xtal)) {
 			printk(KERN_ERR "%s cannot get xtal\n", __func__);
-			ret = -EBUSY;
+			ret = PTR_ERR(xtal);
 		} else {
 			pclk = clk_get(&s3c24xx_uda134x_snd_device->dev,
 				       "pclk");
-			if (!pclk) {
+			if (IS_ERR(pclk)) {
 				printk(KERN_ERR "%s cannot get pclk\n",
 				       __func__);
 				clk_put(xtal);
-				ret = -EBUSY;
+				ret = PTR_ERR(pclk);
 			}
 		}
 		if (!ret) {
Signature · 1 line
1.7.4.1
Applied
#1 lore raw
Quoted 2 lines · Axel Lin

clk_get() returns a pointer to the struct clk or an ERR_PTR(). This patch also use PTR_ERR() for return value.

Applied, thanks.