Index: uspace/lib/usbdev/include/usb/dev/poll.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/poll.h	(revision 4603b35bfff3d939df56b8ba944e6aba6c14b3a6)
+++ uspace/lib/usbdev/include/usb/dev/poll.h	(revision 338729c6d8dfc00f37b27062fff78e556ef22be1)
@@ -1,4 +1,5 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2017 Petr Manek
  * All rights reserved.
  *
Index: uspace/lib/usbdev/src/devpoll.c
===================================================================
--- uspace/lib/usbdev/src/devpoll.c	(revision 4603b35bfff3d939df56b8ba944e6aba6c14b3a6)
+++ uspace/lib/usbdev/src/devpoll.c	(revision 338729c6d8dfc00f37b27062fff78e556ef22be1)
@@ -1,4 +1,5 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2017 Petr Manek
  * All rights reserved.
  *
@@ -281,5 +282,6 @@
 
 	/* Unregister the pipe. */
-	if ((rc = usb_device_unmap_ep(polling->ep_mapping)))
+	rc = usb_device_unmap_ep(polling->ep_mapping);
+	if (rc != EOK && rc != ENOENT)
 		return rc;