diff --git a/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp b/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp
index 80dbd314ac..c221e3081f 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp
+++ b/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp
@@ -240,7 +240,7 @@ usb_hid_close(void *_cookie)
 	device_cookie *cookie = (device_cookie *)_cookie;
 
 	TRACE("close(%p)\n", cookie);
-	return cookie->handler->Close();
+	return cookie->handler->Close(&cookie->cookie);
 }
 
 
diff --git a/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.cpp b/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.cpp
index f092d6903a..bcb8a27b41 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.cpp
+++ b/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.cpp
@@ -111,7 +111,7 @@ ProtocolHandler::Open(uint32 flags, uint32 *cookie)
 
 
 status_t
-ProtocolHandler::Close()
+ProtocolHandler::Close(uint32 *cookie)
 {
 	return fDevice->Close(this);
 }
diff --git a/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.h b/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.h
index bc5fec8769..2d5724f0e1 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.h
+++ b/src/add-ons/kernel/drivers/input/usb_hid/ProtocolHandler.h
@@ -20,20 +20,20 @@ public:
 									size_t ringBufferSize);
 	virtual						~ProtocolHandler();
 
-			status_t			InitCheck() { return fStatus; };
+			status_t			InitCheck() { return fStatus; }
 
-			HIDDevice *			Device() { return fDevice; };
+			HIDDevice *			Device() { return fDevice; }
 
-			const char *		BasePath() { return fBasePath; };
+			const char *		BasePath() { return fBasePath; }
 			void				SetPublishPath(char *publishPath);
-			const char *		PublishPath() { return fPublishPath; };
+			const char *		PublishPath() { return fPublishPath; }
 
 	static	void				AddHandlers(HIDDevice *device,
 									ProtocolHandler ***handlerList,
 									uint32 *handlerCount);
 
 	virtual	status_t			Open(uint32 flags, uint32 *cookie);
-	virtual	status_t			Close();
+	virtual	status_t			Close(uint32 *cookie);
 
 	virtual	status_t			Control(uint32 *cookie, uint32 op, void *buffer,
 									size_t length);