Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Takashi Iwai <tiwai@suse.de>,
	alsa-devel@alsa-project.org, eric miao <eric.miao@marvell.com>,
	linux-arm-kernel@lists.arm.linux.org.uk
Subject: Re: [PATCH] Convert ASoC pxa2xx-ac97 driver to use the clock API
Date: Thu, 21 Feb 2008 15:26:13 +0000	[thread overview]
Message-ID: <20080221152613.GA19670@flint.arm.linux.org.uk> (raw)
In-Reply-To: <1203437058-7288-3-git-send-email-broonie@opensource.wolfsonmicro.com>

On Tue, Feb 19, 2008 at 04:04:17PM +0000, Mark Brown wrote:
> @@ -294,16 +299,37 @@ static int pxa2xx_ac97_probe(struct platform_device *pdev)
>  #ifdef CONFIG_PXA27x
>  	/* Use GPIO 113 as AC97 Reset on Bulverde */
>  	pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
> +
> +	ac97conf_clk = clk_get(&pdev->dev, "AC97CONFCLK");
> +	if (IS_ERR(ac97conf_clk)) {
> +		ac97conf_clk = NULL;
> +		ret = -ENODEV;

		ret = PTR_ERR(ac97conf_clk);

Always propagate error codes.

> +		goto err_irq;
> +	}
>  #endif
> -	pxa_set_cken(CKEN_AC97, 1);
> +	ac97_clk = clk_get(&pdev->dev, "AC97CLK");
> +	if (IS_ERR(ac97_clk)) {
> +		ac97_clk = NULL;
> +		ret = -ENODEV;

Ditto.

> +		goto err_irq;
> +	}
>  	return 0;
>  
> - err:
> -	if (CKEN & (1 << CKEN_AC97)) {
> -		GCR |= GCR_ACLINK_OFF;
> -		free_irq(IRQ_AC97, NULL);
> -		pxa_set_cken(CKEN_AC97, 0);
> + err_irq:
> +	GCR |= GCR_ACLINK_OFF;
> +	if (ac97_clk) {
> +		clk_disable(ac97_clk);
> +		clk_put(ac97_clk);
> +		ac97_clk = NULL;
>  	}

Under what circumstance will we get here with a non-NULL ac97_clk?


-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

  parent reply	other threads:[~2008-02-21 15:26 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-19 16:03 [0/4] Convert PXA AC97 to use clock API Mark Brown
2008-02-19 16:04 ` [PATCH] Add PXA2xx AC97 clocks to " Mark Brown
2008-02-19 16:04   ` [PATCH] Support AC97CLK on PXA3xx via the " Mark Brown
2008-02-19 16:04     ` [PATCH] Convert ASoC pxa2xx-ac97 driver to use " Mark Brown
2008-02-19 16:04       ` [PATCH] Convert non-SoC PXA2xx AC97 driver to " Mark Brown
2008-02-19 16:40         ` Takashi Iwai
2008-02-21 15:27         ` Russell King - ARM Linux
2008-02-21 15:53           ` Mark Brown
2008-02-21 16:00           ` Mark Brown
2008-02-19 16:39       ` [PATCH] Convert ASoC pxa2xx-ac97 driver to use the " Takashi Iwai
2008-02-20  0:59         ` Eric Miao
2008-02-20 11:08           ` Mark Brown
2008-02-21 15:26       ` Russell King - ARM Linux [this message]
2008-02-21 15:43         ` Mark Brown
2008-02-21 15:59           ` Mark Brown
2008-02-19 16:39 ` [0/4] Convert PXA AC97 to use " Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080221152613.GA19670@flint.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=eric.miao@marvell.com \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox