ASoC: Fixes for tlv320aic31xx

A few fixes for issues not yet identified by the zero day tester due to
the last pull request being rushed in order to clean up the problem with
the git mismerge.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJTIfDTAAoJELSic+t+oim9KT8P/ifEuU4EX9+oSgXeoIMkufEe
6dneLoXlmsbfelxUA2yuTOtbS+mQgrn0TfcWHGIrID8gM1rYF1UZSxQX2OMYUVCz
z+9/4Fh08vowTOEPWySAoJypHTAhyv5ep7FzD8k/X+qIiQRO8eBmW68qD54ISoW8
IX4QKvPTtfdrRElvZUehtBIjzbdLOIAXZ7NRqrvI3gY1lHuBCBtZPUvbcLSHJOzi
60QC/HbbRv2dVKytZC/oS6dnG3W+1KVtDhEI1DjJF5Oinj0s8tbFuq5zS1hvGhNb
i0pi9hCnz9py1PN3Wu6S2omkr6V9BI6gDlQmkiKTK/RfF3Q1FwO2+GPvN/zRkWI7
hxm/H8mOa5wuyGDkDcm9qH8D5vX32cHwsGoQq1gdFXeCRwg8x+Ug1u8/csnEqsbf
vW7xOgOAvhk5pDB8l0adb1FOYHbsBF76vot3pkY0V3k0tM+05iGbN+fdrI0rK0m4
TYFMvB6RdNuRebOJvuBKT+hBNoAwCsARiIVbC0fAQVIagZiMojXFvuFaprBFqDcf
G9H46MknURx6iKyuaLwKRd1ZQMbuKFVsAvoNSONHSghxkqU4zgHLNLwYibWsADka
MqoxIFtoKSZ0hXrJa+AFvZb7HhQWR46gnEvA9XCngG/p0HGiiHxsX3FoCHnqlBpm
XJ+7fBbwu6W/1aF1XyF1
=2pCM
-----END PGP SIGNATURE-----