August 2011 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] Headset driver detection problem during bootup
by anish singh 23 Aug '11

23 Aug '11

adding more information and experts on alsa. On Fri, Aug 19, 2011 at 9:23 PM, anish singh <anish198519851985(a)gmail.com> wrote: > I need some suggestions for below situation: > > Headset if it is inserted before the device is powered up is > now detected by forcefully calling the interrupt handler in > the probe function of the headset driver. Headset is detected in our andorid device by using a detect gpio which is turned on when headset is inserted.If the headset is inserted right from very beginging i.e. before device is even turned on then we forcefully call the handler and thereby in handler we check if gpio is turned on or not and do the rest of things. > Once the handler is called then we find out if the headset > is there or not using gpio and then normal detection happens > > Is it the right way to detect the device during power-up? Does not linux have any other way of doing this which i may be missing? How this is handled in the case of ALSA jack i.e. the jack drivers which is using alsa framework for detection? Android doesn't use ALSA framework for reporting JACK. > > After the device is powered up and then if we insert headset > then it is working fine by calling the interrupt handler and > everything goes fine. > > linux -2.3.5 > Android Device >

2 2

[PATCH] ALSA: hda: hdmi: Hint matching between input devices and pcm devices
by David Henningsson 23 Aug '11

23 Aug '11

Since modern HDMI cards often have more than one output pin and thus input device, we need to know which one has actually been plugged in. This patch adds a name hint that indicates which PCM device is connected to which pin. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_hdmi.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 19cb72d..8c83ec4 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -967,19 +967,12 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->pin_nid = pin_nid; - err = snd_hda_input_jack_add(codec, pin_nid, - SND_JACK_VIDEOOUT, NULL); - if (err < 0) - return err; - err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; spec->num_pins++; - hdmi_present_sense(codec, pin_nid, eld); - return 0; } @@ -1162,6 +1155,25 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec) return 0; } +static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) +{ + int err; + char hdmi_str[32]; + struct hdmi_spec *spec = codec->spec; + struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; + int pcmdev = spec->pcm_rec[pin_idx].device; + + snprintf(hdmi_str, sizeof(hdmi_str), "HDMI/DP,pcm=%d", pcmdev); + + err = snd_hda_input_jack_add(codec, per_pin->pin_nid, + SND_JACK_VIDEOOUT, pcmdev > 0 ? hdmi_str : NULL); + if (err < 0) + return err; + + hdmi_present_sense(codec, per_pin->pin_nid, &per_pin->sink_eld); + return 0; +} + static int generic_hdmi_build_controls(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; @@ -1170,6 +1182,11 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; + + err = generic_hdmi_build_jack(codec, pin_idx); + if (err < 0) + return err; + err = snd_hda_create_spdif_out_ctls(codec, per_pin->pin_nid, per_pin->mux_nids[0]); -- 1.7.4.1 --------------010607010305070404080608--

1 0

[PATCH] ALSA: hda: hdmi: Hint matching between input devices and pcm devices
by David Henningsson 23 Aug '11

23 Aug '11

Since modern HDMI cards often have more than one output pin and thus input device, we need to know which one has actually been plugged in. This patch adds a name hint that indicates which PCM device is connected to which pin. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_hdmi.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 19cb72d..8c83ec4 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -967,19 +967,12 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->pin_nid = pin_nid; - err = snd_hda_input_jack_add(codec, pin_nid, - SND_JACK_VIDEOOUT, NULL); - if (err < 0) - return err; - err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; spec->num_pins++; - hdmi_present_sense(codec, pin_nid, eld); - return 0; } @@ -1162,6 +1155,25 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec) return 0; } +static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) +{ + int err; + char hdmi_str[32]; + struct hdmi_spec *spec = codec->spec; + struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; + int pcmdev = spec->pcm_rec[pin_idx].device; + + snprintf(hdmi_str, sizeof(hdmi_str), "HDMI/DP,pcm=%d", pcmdev); + + err = snd_hda_input_jack_add(codec, per_pin->pin_nid, + SND_JACK_VIDEOOUT, pcmdev > 0 ? hdmi_str : NULL); + if (err < 0) + return err; + + hdmi_present_sense(codec, per_pin->pin_nid, &per_pin->sink_eld); + return 0; +} + static int generic_hdmi_build_controls(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; @@ -1170,6 +1182,11 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; + + err = generic_hdmi_build_jack(codec, pin_idx); + if (err < 0) + return err; + err = snd_hda_create_spdif_out_ctls(codec, per_pin->pin_nid, per_pin->mux_nids[0]); -- 1.7.4.1 --------------040904060507060402050704--

1 0

[PATCH] ALSA: hda: hdmi: Hint matching between input devices and pcm devices
by David Henningsson 23 Aug '11

23 Aug '11

Since modern HDMI cards often have more than one output pin and thus input device, we need to know which one has actually been plugged in. This patch adds a name hint that indicates which PCM device is connected to which pin. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_hdmi.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 19cb72d..8c83ec4 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -967,19 +967,12 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->pin_nid = pin_nid; - err = snd_hda_input_jack_add(codec, pin_nid, - SND_JACK_VIDEOOUT, NULL); - if (err < 0) - return err; - err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; spec->num_pins++; - hdmi_present_sense(codec, pin_nid, eld); - return 0; } @@ -1162,6 +1155,25 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec) return 0; } +static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) +{ + int err; + char hdmi_str[32]; + struct hdmi_spec *spec = codec->spec; + struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; + int pcmdev = spec->pcm_rec[pin_idx].device; + + snprintf(hdmi_str, sizeof(hdmi_str), "HDMI/DP (pcm %d)", pcmdev); + + err = snd_hda_input_jack_add(codec, per_pin->pin_nid, + SND_JACK_VIDEOOUT, pcmdev > 0 ? hdmi_str : NULL); + if (err < 0) + return err; + + hdmi_present_sense(codec, per_pin->pin_nid, &per_pin->sink_eld); + return 0; +} + static int generic_hdmi_build_controls(struct hda_codec *codec) { struct hdmi_spec *spec = codec->spec; @@ -1170,6 +1182,11 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; + + err = generic_hdmi_build_jack(codec, pin_idx); + if (err < 0) + return err; + err = snd_hda_create_spdif_out_ctls(codec, per_pin->pin_nid, per_pin->mux_nids[0]); -- 1.7.4.1 --------------040603040001050104040801--

1 0

[alsa-devel] ALSA calls don't work within Mozilla plug-ins
by Olivier Guillion - Myriad 23 Aug '11

23 Aug '11

Hi, I'm trying to develop a Mozilla plug-in that display and plays music scores. The music rendering module uses ALSA for sound (pcm) output. It seems that, when called from a Mozilla plug-in, any ALSA function that gets a pointer as parameter either crashes or returns wrong values. I made a very simple test plug-in from the "Basic Plugin" source code provided by Mozilla (I can provide the full project if needed). Here is what happens: - Calling "snd_asoundlib_version" works - Calling "snd_device_name_hint" crashes - If the browser runs in super-user mode (sudo firefox), all works fine. - If I load the plug-in (which is a shared library) from a program of my own and call the test function, it works. Does anyone have any idea about what could cause this issue? Could it be related to access rights or memory allocation/mapping? I'm using: Ubuntu 11.04 Firefox 6.0 ALSA 1.0.24.1 I'm really stuck here, any advice would be highly appreciated. Thank you, Olivier Olivier Guillion Myriad 26 rue Michel de Montaigne 31200 Toulouse FRANCE -------- WebSite ----------- http://www.myriad-online.com Download here the latest version of our shareware programs, view the online tutorials or get info about Myriad and its activities. ---------------------------------

1 1

[PATCH] alsa-plugins: Pulse: only underrun if no more data has been written
by David Henningsson 23 Aug '11

23 Aug '11

If more data has already been written after the underrun, the underrun will automatically end and therefore we should not report it or restart the stream. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- pulse/pcm_pulse.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c index d6c6792..92f4777 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c @@ -40,8 +40,10 @@ typedef struct snd_pcm_pulse { size_t ptr; int underrun; int handle_underrun; + int handle_underrun_detect; size_t offset; + int64_t written; pa_stream *stream; @@ -460,6 +462,7 @@ static snd_pcm_sframes_t pulse_write(snd_pcm_ioplug_t * io, /* Make sure the buffer pointer is in sync */ pcm->last_size -= writebytes; + pcm->written += writebytes; ret = update_ptr(pcm); if (ret < 0) goto finish; @@ -585,6 +588,23 @@ static void stream_request_cb(pa_stream * p, size_t length, void *userdata) update_active(pcm); } +#if defined(PA_CHECK_VERSION) && PA_CHECK_VERSION(0,99,0) + +#define has_underrun_detect 1 + +static inline int do_underrun_detect(snd_pcm_pulse_t *pcm, pa_stream *p) +{ + return pcm->handle_underrun_detect && + pcm->written <= pa_stream_get_underflow_index(p); +} + +#else + +#define has_underrun_detect 0 +#define do_underrun_detect(pcm, p) 0 + +#endif + static void stream_underrun_cb(pa_stream * p, void *userdata) { snd_pcm_pulse_t *pcm = userdata; @@ -594,7 +614,8 @@ static void stream_underrun_cb(pa_stream * p, void *userdata) if (!pcm->p) return; - pcm->underrun = 1; + if (pcm->handle_underrun || do_underrun_detect(pcm, p)) + pcm->underrun = 1; } static void stream_latency_cb(pa_stream *p, void *userdata) { @@ -697,7 +718,7 @@ static int pulse_prepare(snd_pcm_ioplug_t * io) if (io->stream == SND_PCM_STREAM_PLAYBACK) { pa_stream_set_write_callback(pcm->stream, stream_request_cb, pcm); - if (pcm->handle_underrun) + if (pcm->handle_underrun_detect || pcm->handle_underrun) pa_stream_set_underflow_callback(pcm->stream, stream_underrun_cb, pcm); r = pa_stream_connect_playback(pcm->stream, pcm->device, @@ -739,6 +760,7 @@ static int pulse_prepare(snd_pcm_ioplug_t * io) pcm->offset = 0; pcm->underrun = 0; + pcm->written = 0; /* Reset fake ringbuffer */ pcm->last_size = 0; @@ -984,6 +1006,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) const char *device = NULL; const char *fallback_name = NULL; int handle_underrun = 0; + int handle_underrun_detect = 1; int err; snd_pcm_pulse_t *pcm; @@ -1017,6 +1040,14 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) handle_underrun = err; continue; } + if (strcmp(id, "handle_underrun_detect") == 0) { + if ((err = snd_config_get_bool(n)) < 0) { + SNDERR("Invalid value for %s", id); + return -EINVAL; + } + handle_underrun_detect = err; + continue; + } if (strcmp(id, "fallback") == 0) { if (snd_config_get_string(n, &fallback_name) < 0) { SNDERR("Invalid value for %s", id); @@ -1051,6 +1082,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) } pcm->handle_underrun = handle_underrun; + pcm->handle_underrun_detect = has_underrun_detect && handle_underrun_detect; err = pulse_connect(pcm->p, server, fallback_name != NULL); if (err < 0) -- 1.7.5.4 --------------040808080001070501040605--

1 0

[alsa-devel] [RME MADI/RayDAT/AIO/AES] Changing hdspm_config and hdspm_status
by Adrian Knoth 23 Aug '11

23 Aug '11

Hi! Florian Faber has sent me some new bits of his work on hdspm. While the changes to hdspm.c are straight-forward, he also cleaned up struct hdspm_config and hdspm_status, thus changing the userspace API/ABI: diff --git a/include/sound/hdspm.h b/include/sound/hdspm.h index 1f59ea2..25eab09 100644 --- a/include/sound/hdspm.h +++ b/include/sound/hdspm.h @@ -58,17 +58,20 @@ struct hdspm_peak_rms { /* ------------ CONFIG block IOCTL ---------------------- */ struct hdspm_config { - unsigned char pref_sync_ref; - unsigned char wordclock_sync_check; - unsigned char madi_sync_check; - unsigned int system_sample_rate; - unsigned int autosync_sample_rate; - unsigned char system_clock_mode; - unsigned char clock_source; - unsigned char autosync_ref; - unsigned char line_out; - unsigned int passthru; - unsigned int analog_out; + uint32_t dds; /* dds increment */ + uint16_t freq; /* 32000/44100/48000 */ + uint8_t wck_mul; /* 1/2/4 */ + uint8_t clock_mode; /* 0=master, 1=slave */ + union { + struct { + uint8_t line_out; /* 0=disabled, 1=enabled */ + uint8_t tms; /* 0=disabled, 1=enabled */ + uint8_t input_select; /* 0=BNC, 1=optical */ + uint8_t output_mode; /* 0=56ch, 1=64ch */ + uint8_t output_frame; /* 0=48K, 1=96K */ + uint8_t sync_ref; /* 0=WCK, 1=MADI, 2=TCO/SYNC_IN, 3=SYNC_IN */ + } madi; + } card_specific; }; #define SNDRV_HDSPM_IOCTL_GET_CONFIG \ @@ -161,7 +164,6 @@ struct hdspm_status { uint8_t sync_madi; /* enum hdspm_sync */ uint8_t sync_tco; /* enum hdspm_sync */ uint8_t sync_in; /* enum hdspm_sync */ - uint8_t madi_input; /* enum hdspm_madi_input */ uint8_t channel_format; /* enum hdspm_madi_channel_format */ uint8_t frame_format; /* enum hdspm_madi_frame_format */ } madi; I guess this means we'd need to redefine two ioctl numbers. Besides this, are there any current users of this code? The changes are not upstream, yet, so we could arrange for a grace period, maybe saying something like "Starting with Linux-3.x and ALSA-1.0.y, you'll have to change your code". X and Y are yet to be chosen wisely. If you're interested to check if the upcoming changes affect your code, I can send you the complete driver. I'll post the changes to hdspm.c in a second, but that's just a preview for discussion, not necessarily the final patch. Cheers

2 3

Re: [alsa-devel] Please review rt5631 driver on alsa 1.0.24 again
by Mark Brown 23 Aug '11

23 Aug '11

On Mon, Aug 22, 2011 at 11:31:30AM +0800, johnnyhsu wrote: > +/* MIC Input Type */ > +static const char *rt5631_input_mode[] = { > + "Single-end", "Differential"}; Single ended. > +/* MIC Boost Volume */ > +static const char *rt5631_mic_boost[] = {"Bypass", "+20db", "+24db", "+30db", > + "+35db", "+40db", "+44db", "+50db", "+52db"}; TLV please. I'm fairly sure I mentioned this last time. > +/* Record Data Select */ > +static const char *rt5631_rec_sel[] = {"Disable", "MIC1", "MIC2", "Stereo"}; > + > +static const SOC_ENUM_SINGLE_DECL( > + rt5631_rec_sel_enum, RT5631_INT_ST_IRQ_CTRL_2, > + RT5631_ADC_DATA_SEL_SHIFT, rt5631_rec_sel); This looks like DAPM... > +/* SPK Channel Volume Input Select */ > +static const char *rt5631_spkvol_sel[] = {"VMID", "SPKMIX"}; > +static const SOC_ENUM_DOUBLE_DECL( > + rt5631_spkvol_enum, RT5631_SPK_OUT_VOL, > + RT5631_L_EN_SHIFT, RT5631_R_EN_SHIFT, rt5631_spkvol_sel); This too, and similarly for the other mixers. > +static void rt5631_set_dmic_params(struct snd_soc_codec *codec, > + struct snd_pcm_hw_params *params) > +{ > + int rate; > + > + snd_soc_update_bits(codec, RT5631_GPIO_CTRL, > + RT5631_GPIO_PIN_FUN_SEL_MASK | > + RT5631_GPIO_DMIC_FUN_SEL_MASK, > + RT5631_GPIO_PIN_FUN_SEL_GPIO_DIMC | > + RT5631_GPIO_DMIC_FUN_SEL_DIMC); Shouldn't this be done once in th eprobe function? DMICs aren't usually hotplugged... > + snd_soc_update_bits(codec, RT5631_DIG_MIC_CTRL, > + RT5631_DMIC_ENA_MASK, RT5631_DMIC_ENA); This looks like DAPM. > + snd_soc_update_bits(codec, RT5631_DIG_MIC_CTRL, > + RT5631_DMIC_L_CH_LATCH_MASK | > + RT5631_DMIC_R_CH_LATCH_MASK, > + RT5631_DMIC_L_CH_LATCH_FALLING | > + RT5631_DMIC_R_CH_LATCH_RISING); This also looks like probe work. > + default: > + break; > + } Should return an error if you don't know how to configure. > + snd_soc_update_bits(codec, RT5631_SDP_CTRL, > + RT5631_SDP_I2S_DL_MASK, iface); > + if (coeff >= 0) > + snd_soc_write(codec, RT5631_STEREO_AD_DA_CLK_CTRL, > + coeff_div[coeff].reg_val); What if you didn't find coefficients? > +static int rt5631_hifi_codec_set_dai_sysclk(struct snd_soc_dai *codec_dai, > + int clk_id, unsigned int freq, int dir) > +{ > + struct snd_soc_codec *codec = codec_dai->codec; > + struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec); > + > + pr_info("enter %s, syclk=%d\n", __func__, freq); > + if ((freq >= (256 * 8000)) && (freq <= (512 * 96000))) { > + rt5631->sysclk = freq; > + return 0; > + } > + > + pr_info("unsupported sysclk freq %u for audio i2s\n", freq); > + pr_info("set sysclk to 24.576Mhz by default\n"); > + > + rt5631->sysclk = 24576000; > + return 0; No, return an error if the user specified something you don't understand. If that's the sysclk the user can always specify it directly. > +static int rt5631_codec_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, > + int source, unsigned int freq_in, unsigned int freq_out) > +{ > + struct snd_soc_codec *codec = codec_dai->codec; > + struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec); > + int i, ret = -EINVAL; > + > + printk(KERN_DEBUG "enter %s\n", __func__); > + > + if (!freq_in || !freq_out) > + return 0; Should stop the PLL if a zero output is requested. > +/** > + * rt5631_index_reg_show - sysfs file for dumping index registers of 2nd layer > + */ > +#define IDX_REG_FMT "%02x: %04x\n" > +#define IDX_REG_LEN 9 > +static ssize_t rt5631_index_reg_show(struct device *dev, > + struct device_attribute *attr, char *buf) You didn't answer any of my queries about this stuff on the prior posting... > + ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); > + if (ret != 0) { > + dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); > + return ret; > + } > + codec->cache_bypass = 1; Why cache_bypass? > + /* speaker ratio is 1.44x */ > + snd_soc_write(codec, RT5631_GEN_PUR_CTRL_REG, 0x4e00); Hrm?

1 0

[alsa-devel] [PATCH 2/2] ASoC: mxs-sgtl5000: add record function
by Dong Aisheng 23 Aug '11

23 Aug '11

Signed-off-by: Dong Aisheng <b29396(a)freescale.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Wolfram Sang <w.sang(a)pengutronix.de> --- sound/soc/mxs/mxs-sgtl5000.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index a0d89c9..7fbeaec 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -85,13 +85,21 @@ static struct snd_soc_ops mxs_sgtl5000_hifi_ops = { static struct snd_soc_dai_link mxs_sgtl5000_dai[] = { { - .name = "HiFi", + .name = "HiFi Tx", .stream_name = "HiFi Playback", .codec_dai_name = "sgtl5000", .codec_name = "sgtl5000.0-000a", .cpu_dai_name = "mxs-saif.0", .platform_name = "mxs-pcm-audio.0", .ops = &mxs_sgtl5000_hifi_ops, + }, { + .name = "HiFi Rx", + .stream_name = "HiFi Capture", + .codec_dai_name = "sgtl5000", + .codec_name = "sgtl5000.0-000a", + .cpu_dai_name = "mxs-saif.1", + .platform_name = "mxs-pcm-audio.1", + .ops = &mxs_sgtl5000_hifi_ops, }, }; -- 1.7.0.4

3 2

[alsa-devel] [PATCH 3/4] sound/soc/mxs/mxs-saif.c: add missing kfree
by Julia Lawall 23 Aug '11

23 Aug '11

From: Julia Lawall <julia(a)diku.dk> The error handling code prior to get_clk also needs to call kfree. The label name is changed to reflect its more general use. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier x; expression E1!=0,E2,E3,E4; statement S; iterator I; @@ ( if (...) { ... when != kfree(x) when != x = E3 when != E3 = x * return ...; } ... when != x = E2 when != I(...,x,...) S if (...) { ... when != x = E4 kfree(x); ... return ...; } ) // </smpl> Signed-off-by: Julia Lawall <julia(a)diku.dk> --- sound/soc/mxs/mxs-saif.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 0b3adae..4a17bc8 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -523,8 +523,10 @@ static int mxs_saif_probe(struct platform_device *pdev) if (!saif) return -ENOMEM; - if (pdev->id >= ARRAY_SIZE(mxs_saif)) - return -EINVAL; + if (pdev->id >= ARRAY_SIZE(mxs_saif)) { + ret = -EINVAL; + goto failed; + } mxs_saif[pdev->id] = saif; saif->clk = clk_get(&pdev->dev, NULL); @@ -532,7 +534,7 @@ static int mxs_saif_probe(struct platform_device *pdev) ret = PTR_ERR(saif->clk); dev_err(&pdev->dev, "Cannot get the clock: %d\n", ret); - goto failed_clk; + goto failed; } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -625,7 +627,7 @@ failed_ioremap: release_mem_region(res->start, resource_size(res)); failed_get_resource: clk_put(saif->clk); -failed_clk: +failed: kfree(saif); return ret;

5 9