am 596e9c63: Merge "fix valgrind ioctl warning."

* commit '596e9c6314e4f2869499bcdbb816680ddb10c88f':
  fix valgrind ioctl warning.