diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2009-12-26 22:52:13 -0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-26 22:37:08 -0500 |
| commit | ead510cebcdf41c92fce2a909f342255b028a33d (patch) | |
| tree | fae598051fbe1e8991189919f8ac1b58c060774b /drivers | |
| parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
| download | blackbird-op-linux-ead510cebcdf41c92fce2a909f342255b028a33d.tar.gz blackbird-op-linux-ead510cebcdf41c92fce2a909f342255b028a33d.zip | |
thinkpad-acpi: don't take the first ALSA slot by default
We don't want to be the first soundcard. We don't want to shift other
soundcards out of the way either, even if they load much later.
Ask ALSA to (by default) load us in one of the last three slots. This
can be overriden at will using the "index" parameter.
Reported-by: Whoopie <whoopie79@gmx.net>
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 448c8aeb166b..3311b0020569 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -6388,7 +6388,7 @@ static struct ibm_struct brightness_driver_data = { #define TPACPI_ALSA_SHRTNAME "ThinkPad Console Audio Control" #define TPACPI_ALSA_MIXERNAME TPACPI_ALSA_SHRTNAME -static int alsa_index = SNDRV_DEFAULT_IDX1; +static int alsa_index = ~((1 << (SNDRV_CARDS - 3)) - 1); /* last three slots */ static char *alsa_id = "ThinkPadEC"; static int alsa_enable = SNDRV_DEFAULT_ENABLE1; |
