compat: backport upstream firmware_class bug through f45f3c1f