Integration of the https://patchwork.ozlabs.org/patch/686205/ fix by Joseph Myersk Signed-off-by: spaun2002 <spaun2002mobile@gmail.com>