Fix: reatach kernel driver after releasing controller device. Fixes #188

kozec · Mar 29, 2017 · 7205b82 · 7205b82
1 parent fbd6645
commit 7205b82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/scc/drivers/sc_dongle.py b/scc/drivers/sc_dongle.py
@@ -82,7 +82,7 @@ def close(self):
 		# Called when dongle is removed
 		for c in self._controllers.values():
 			self.daemon.remove_controller(c)
-		self._controllers = []
+		self._controllers = {}
 		USBDevice.close(self)
 
 

diff --git a/scc/drivers/usb.py b/scc/drivers/usb.py
@@ -149,6 +149,7 @@ def unclaim(self):
 		for number in self._claimed:
 			try:
 				self.handle.releaseInterface(number)
+				self.handle.attachKernelDriver(number)
 			except usb1.USBErrorNoDevice, e:
 				# Safe to ignore, happens when USB is removed
 				pass
@@ -157,12 +158,12 @@ def unclaim(self):
 
 	def close(self):
 		""" Called after device is disconnected """
-		self.unclaim()
 		try:
-			self.handle.close()
+			self.unclaim()
 		except: pass
 		try:
-			self.device.close()
+			self.handle.resetDevice()
+			self.handle.close()
 		except: pass