Merge branch 'for-4.20/cougar' into for-linus

Functional fixes for hid-cougar driver