am 7f5c515c: am ef54fe9a: Fix compilation error by declaring stride before the first goto

Merge commit '7f5c515c64a62c400f692ec2c3670a7b16a01a91'

* commit '7f5c515c64a62c400f692ec2c3670a7b16a01a91':
  Fix compilation error by declaring stride before the first goto