Merge pull request #1622 from NiLuJe/master

Unbreak on Kindles

frontend/device/kindle/device.lua

@@ -20,7 +20,7 @@ local KindleDXG = Kindle:new{
     hasKeys = yes,
 }
 
-local Kindle3 = Kindle2:new{
+local Kindle3 = Kindle:new{
     model = "Kindle3",
     hasKeyboard = yes,
     hasKeys = yes,
@@ -104,8 +104,8 @@ function Kindle3:init()
         device = self,
         event_map = require("device/kindle/event_map_keyboard"),
     }
+    self.input.open("/dev/input/event0")
     self.input.open("/dev/input/event1")
-    self.input.open("/dev/input/event2")
     Kindle.init(self)
 end
 
@@ -115,7 +115,6 @@ function Kindle4:init()
         device = self,
         event_map = require("device/kindle/event_map_kindle4"),
     }
-    self.input.event_map = require("device/kindle/event_map_kindle4")
     self.input.open("/dev/input/event1")
     Kindle.init(self)
 end
@@ -293,6 +292,7 @@ end
 local kindle_sn = io.open("/proc/usid", "r")
 if not kindle_sn then return end
 local kindle_devcode = string.sub(kindle_sn:read(),3,4)
+kindle_sn:seek("set")
 local kindle_devcode_v2 = string.sub(kindle_sn:read(),4,6)
 kindle_sn:close()