diff --git a/[refs] b/[refs]
index 31e0349d59fd..a1c144948167 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee7aa6ce41e08c68f72b5ca8f14fb61286dc2418
+refs/heads/master: 331cb022d3ac1f85f7842a51495c33c629e947bc
diff --git a/trunk/drivers/input/tablet/kbtab.c b/trunk/drivers/input/tablet/kbtab.c
index 76b5d526cde9..3f7d1254b8ed 100644
--- a/trunk/drivers/input/tablet/kbtab.c
+++ b/trunk/drivers/input/tablet/kbtab.c
@@ -193,13 +193,11 @@ static void kbtab_disconnect(struct usb_interface *intf)
 	struct kbtab *kbtab = usb_get_intfdata(intf);
 
 	usb_set_intfdata(intf, NULL);
-	if (kbtab) {
-		usb_kill_urb(kbtab->irq);
-		input_unregister_device(kbtab->dev);
-		usb_free_urb(kbtab->irq);
-		usb_buffer_free(interface_to_usbdev(intf), 8, kbtab->data, kbtab->data_dma);
-		kfree(kbtab);
-	}
+
+	input_unregister_device(kbtab->dev);
+	usb_free_urb(kbtab->irq);
+	usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
+	kfree(kbtab);
 }
 
 static struct usb_driver kbtab_driver = {