diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:15 +0100 |
| commit | a1cb98ac8b6980fcd530271c739c3dd7436a91aa (patch) | |
| tree | 02a084f7ccb9d80c60a99c15d66800154fed146e /sound/soc/soc-jack.c | |
| parent | 7c0815289113167bee2da337afa6b34e3077e4f5 (diff) | |
| parent | 0f2780ad4c2a398528c7bb1572158d6e894e5dd2 (diff) | |
| download | blackbird-op-linux-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.tar.gz blackbird-op-linux-a1cb98ac8b6980fcd530271c739c3dd7436a91aa.zip | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/soc-jack.c')
| -rw-r--r-- | sound/soc/soc-jack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index d0d98810af91..ab47fea997a3 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -43,7 +43,7 @@ int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type, INIT_LIST_HEAD(&jack->jack_zones); BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier); - return snd_jack_new(codec->card->snd_card, id, type, &jack->jack); + return snd_jack_new(codec->component.card->snd_card, id, type, &jack->jack); } EXPORT_SYMBOL_GPL(snd_soc_jack_new); @@ -260,7 +260,7 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio) static irqreturn_t gpio_handler(int irq, void *data) { struct snd_soc_jack_gpio *gpio = data; - struct device *dev = gpio->jack->codec->card->dev; + struct device *dev = gpio->jack->codec->component.card->dev; trace_snd_soc_jack_irq(gpio->name); |
