---

yaml --- r: 303681 b: refs/heads/master c: f864b60 h: refs/heads/master i: 303679: ce25866 v: v3
git-mirror · May 2, 2012 · 742e9d1 · 742e9d1
1 parent d61fc1e
commit 742e9d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b5ca928e7d09c5ce0cefe6aec7392e4a3aa1d3b
+refs/heads/master: f864b60ad0078b74c765f00f0600588b85c0a239
diff --git a/trunk/drivers/input/touchscreen/usbtouchscreen.c b/trunk/drivers/input/touchscreen/usbtouchscreen.c
@@ -1380,7 +1380,7 @@ static void usbtouch_irq(struct urb *urb)
 	usb_mark_last_busy(interface_to_usbdev(usbtouch->interface));
 	retval = usb_submit_urb(urb, GFP_ATOMIC);
 	if (retval)
-		dev_err(&usbtouch->interface->dev,
+		dev_err(&usbtouch->input->dev,
 			"%s - usb_submit_urb failed with result: %d\n",
 			__func__, retval);
 }
@@ -1623,7 +1623,7 @@ static int usbtouch_probe(struct usb_interface *intf,
 		err = usb_submit_urb(usbtouch->irq, GFP_KERNEL);
 		if (err) {
 			usb_autopm_put_interface(intf);
-			dev_err(&intf->dev,
+			dev_err(&input_dev->dev,
 				"%s - usb_submit_urb failed with result: %d\n",
 				__func__, err);
 			goto out_unregister_input;