The diff looks weird - but its nothing more than 

-   if (!(r_raw_rc_flags & PX4IO_P_RAW_RC_FLAGS_FAILSAFE)) {
...
-   }