From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 2 May 2017 09:02:24 +0000 (+0200)
Subject: Merge branch 'for-4.12/sony' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=800f3eef8ebc1264e9c135bfa892c8ae41fa4792;p=linux.git

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

800f3eef8ebc1264e9c135bfa892c8ae41fa4792
diff --cc drivers/hid/hid-sony.c
index 740996f9bdd49,43213d6ff2d19..d03203a82e8f7
--- a/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);