diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index c7bc9db5b192..98b996ecf4d3 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1229,6 +1229,17 @@ static int usbhid_power(struct hid_device *hid, int lvl)
 	struct usbhid_device *usbhid = hid->driver_data;
 	int r = 0;
 
+	spin_lock_irq(&usbhid->lock);
+	if (test_bit(HID_DISCONNECTED, &usbhid->iofl)) {
+		r = -ENODEV;
+		spin_unlock_irq(&usbhid->lock);
+		goto bail_out;
+	} else {
+		/* protect against disconnect */
+		usb_get_dev(interface_to_usbdev(usbhid->intf));
+		spin_unlock_irq(&usbhid->lock);
+	}
+
 	switch (lvl) {
 	case PM_HINT_FULLON:
 		r = usb_autopm_get_interface(usbhid->intf);
@@ -1238,7 +1249,9 @@ static int usbhid_power(struct hid_device *hid, int lvl)
 		usb_autopm_put_interface(usbhid->intf);
 		break;
 	}
+	usb_put_dev(interface_to_usbdev(usbhid->intf));
 
+bail_out:
 	return r;
 }