drivers/hid: Merge s3ve3g changes