2c2
< * Copyright (c) 2010-2013, 2016 ARM Limited
---
> * Copyright (c) 2010-2013, 2016, 2018 ARM Limited
194c194,195
< transState->finish(fault, req, tc, mode);
---
> // Returning with a fault requires the original request
> transState->finish(fault, s1Req, tc, mode);