Merge branch 'for-4.12/sony' into for-linus

diff --cc drivers/hid/hid-sony.c
index 740996f9bdd49dde3d26659f68d2addbff291c60,43213d6ff2d198306c61dab8e089f1585fd3948d..d03203a82e8f78962697791590ef45b35c003833
--- 1/drivers/hid/hid-sony.c
--- 2/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@@ -2632,8 -2693,8 +2693,10 @@@ err_stop
                sony_leds_remove(sc);
        if (sc->quirks & SONY_BATTERY_SUPPORT)
                sony_battery_remove(sc);
 +      if (sc->touchpad)
 +              sony_unregister_touchpad(sc);
+       if (sc->sensor_dev)
+               sony_unregister_sensors(sc);
        sony_cancel_work_sync(sc);
        kfree(sc->output_report_dmabuf);
        sony_remove_dev_list(sc);