---

yaml --- r: 303675 b: refs/heads/master c: 140b123 h: refs/heads/master i: 303673: 77da69d 303671: a9eaa66 v: v3
git-mirror · May 2, 2012 · 3d7a6b7 · 3d7a6b7
1 parent deb0b6e
commit 3d7a6b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80f8594f63dd35179235aa22901dfa5ce786fe00
+refs/heads/master: 140b1230a19b65489317271da36465e42865f2e4
diff --git a/trunk/drivers/input/mouse/bcm5974.c b/trunk/drivers/input/mouse/bcm5974.c
@@ -584,7 +584,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
 	int retval = 0, size;
 
 	if (!data) {
-		dev_err(&dev->intf->dev, "out of memory\n");
+		dev_err(&dev->input->dev, "out of memory\n");
 		retval = -ENOMEM;
 		goto out;
 	}
@@ -597,7 +597,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
 			BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
 
 	if (size != 8) {
-		dev_err(&dev->intf->dev, "could not read from device\n");
+		dev_err(&dev->input->dev, "could not read from device\n");
 		retval = -EIO;
 		goto out;
 	}
@@ -615,7 +615,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
 			BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
 
 	if (size != 8) {
-		dev_err(&dev->intf->dev, "could not write to device\n");
+		dev_err(&dev->input->dev, "could not write to device\n");
 		retval = -EIO;
 		goto out;
 	}
@@ -654,7 +654,7 @@ static void bcm5974_irq_button(struct urb *urb)
 exit:
 	error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
 	if (error)
-		dev_err(&dev->intf->dev, "button urb failed: %d\n", error);
+		dev_err(&dev->input->dev, "button urb failed: %d\n", error);
 }
 
 static void bcm5974_irq_trackpad(struct urb *urb)
@@ -687,7 +687,7 @@ static void bcm5974_irq_trackpad(struct urb *urb)
 exit:
 	error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
 	if (error)
-		dev_err(&dev->intf->dev, "trackpad urb failed: %d\n", error);
+		dev_err(&dev->input->dev, "trackpad urb failed: %d\n", error);
 }
 
 /*