diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:20 +0100 |
| commit | 2a557a861ae44e1941452bc2d700f1be58c1325b (patch) | |
| tree | d98a4731e5ead58134d231590047904afa6c37da /sound/pci/hda/hda_beep.c | |
| parent | Merge branch 'topic/hda-bus' into for-next (diff) | |
| parent | ALSA: hda - Use shutdown driver ops instead of reboot notifier (diff) | |
| download | linux-2a557a861ae44e1941452bc2d700f1be58c1325b.tar.xz linux-2a557a861ae44e1941452bc2d700f1be58c1325b.zip | |
Merge branch 'topic/hda-unbind' into for-next
Diffstat (limited to 'sound/pci/hda/hda_beep.c')
| -rw-r--r-- | sound/pci/hda/hda_beep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index e98438e95e79..581b7fdef0e3 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c @@ -160,7 +160,7 @@ static int snd_hda_do_attach(struct hda_beep *beep) input_dev->name = "HDA Digital PCBeep"; input_dev->phys = beep->phys; input_dev->id.bustype = BUS_PCI; - input_dev->dev.parent = &codec->bus->card->card_dev; + input_dev->dev.parent = &codec->card->card_dev; input_dev->id.vendor = codec->vendor_id >> 16; input_dev->id.product = codec->vendor_id & 0xffff; @@ -224,7 +224,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid) if (beep == NULL) return -ENOMEM; snprintf(beep->phys, sizeof(beep->phys), - "card%d/codec#%d/beep0", codec->bus->card->number, codec->addr); + "card%d/codec#%d/beep0", codec->card->number, codec->addr); /* enable linear scale */ snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_2, 0x01); |