Fixes for https://github.com/raspberrypi/linux/issues/7301#7302

pelwell merged 2 commits intoraspberrypi:rpi-7.0.yraspberrypi/linux:rpi-7.0.yfrom

by:rpi-7.0.yby/linux:rpi-7.0.yCopy head branch name to clipboard