brought into agreement for i2c-mxs.c of the fiq-fixes branch