diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-18 08:23:37 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-18 08:23:37 +0200 |
| commit | 5a6cc82171dba297ceab49cda47f2bf5616f87b3 (patch) | |
| tree | 1e12036476a4faf4b404a0a4e070d148efafc221 /drivers/acpi/sbs.c | |
| parent | 09ea997677cd44ebe7f42573119aaf46b775c683 (diff) | |
| parent | 7730c0b55043f6ff1c27e9cb45e13679995b2361 (diff) | |
| download | talos-obmc-linux-5a6cc82171dba297ceab49cda47f2bf5616f87b3.tar.gz talos-obmc-linux-5a6cc82171dba297ceab49cda47f2bf5616f87b3.zip | |
Merge tag 'asoc-fix-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.1
A few more fixes for v4.1, some driver fixes plus one core fix which
fixes registration of DAI links when adding prefixes to CODECs to
deuplicate in multi-CODEC systems.
Diffstat (limited to 'drivers/acpi/sbs.c')
| -rw-r--r-- | drivers/acpi/sbs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index cd827625cf07..01504c819e8f 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -684,7 +684,7 @@ static int acpi_sbs_add(struct acpi_device *device) if (!sbs_manager_broken) { result = acpi_manager_get_info(sbs); if (!result) { - sbs->manager_present = 0; + sbs->manager_present = 1; for (id = 0; id < MAX_SBS_BAT; ++id) if ((sbs->batteries_supported & (1 << id))) acpi_battery_add(sbs, id); |
