mptsas.c: Fix "backout 6910752/6968206: needs more work" merge