am a2c9a1e8: am aaf3f56c: block is bad if ioctl() returns nonzero

Merge commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8'

* commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8':
  block is bad if ioctl() returns nonzero