diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-12-05 18:09:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-12-05 18:09:29 +0100 |
| commit | c34e9ab9a612ee8b18273398ef75c207b01f516d (patch) | |
| tree | 6845a1809118a2b2a21d5a638ace1976dd8f8c46 /include/linux/libata.h | |
| parent | 20c3b3e5f2641eff3d85f33e6a468ac052b169bd (diff) | |
| parent | ec16a3cdf37e507013062f9c4a2067eacdd12b62 (diff) | |
Merge tag 'asoc-fix-v6.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13
A few small fixes for v6.13, all system specific - the biggest thing is
the fix for jack handling over suspend on some Intel laptops.
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 9b4a6ff03235..c1a85d46eba6 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -270,9 +270,7 @@ enum { /* bits 24:31 of host->flags are reserved for LLD specific flags */ - /* various lengths of time */ - ATA_TMOUT_BOOT = 30000, /* heuristic */ - ATA_TMOUT_BOOT_QUICK = 7000, /* heuristic */ + /* Various lengths of time */ ATA_TMOUT_INTERNAL_QUICK = 5000, ATA_TMOUT_MAX_PARK = 30000, |