Brings up to date with the quirk in 2.4
This makes sure we only apply it on the right chipsets,
and adjusts the bits that get poked depending on which we find.