Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303575
b: refs/heads/master
c: ef1ffb7
h: refs/heads/master
i:
  303573: 60c363b
  303571: 13d5a76
  303567: 3b16208
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Apr 20, 2012
1 parent 5f37c8c commit 4c52df2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9a527dae346c0ad56410c3794ba5ec535c66bcc
refs/heads/master: ef1ffb7296a19958b7575b382b7b0343bd441646
6 changes: 3 additions & 3 deletions trunk/drivers/usb/misc/idmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,14 @@ static int idmouse_probe(struct usb_interface *interface,
kmalloc(IMGSIZE + dev->bulk_in_size, GFP_KERNEL);

if (!dev->bulk_in_buffer) {
err("Unable to allocate input buffer.");
dev_err(&interface->dev, "Unable to allocate input buffer.\n");
idmouse_delete(dev);
return -ENOMEM;
}
}

if (!(dev->bulk_in_endpointAddr)) {
err("Unable to find bulk-in endpoint.");
dev_err(&interface->dev, "Unable to find bulk-in endpoint.\n");
idmouse_delete(dev);
return -ENODEV;
}
Expand All @@ -385,7 +385,7 @@ static int idmouse_probe(struct usb_interface *interface,
result = usb_register_dev(interface, &idmouse_class);
if (result) {
/* something prevented us from registering this device */
err("Unble to allocate minor number.");
dev_err(&interface->dev, "Unble to allocate minor number.\n");
usb_set_intfdata(interface, NULL);
idmouse_delete(dev);
return result;
Expand Down

0 comments on commit 4c52df2

Please sign in to comment.