Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux...

[linux-2.6] / drivers / usb / misc / phidgetmotorcontrol.c

diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index df0ebcdb9d6a6fbef91cffd476a0f5151945b324..f0113c17cc5afd1d0c6b01173161f57fabc5ea30 100644 (file)
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -61,7 +61,7 @@ static int set_motor(struct motorcontrol *mc, int motor)
 
        buffer = kzalloc(8, GFP_KERNEL);
        if (!buffer) {
-               dev_err(&mc->intf->dev, "%s - out of memory\n", __FUNCTION__);
+               dev_err(&mc->intf->dev, "%s - out of memory\n", __func__);
                return -ENOMEM;
        }
 
@@ -155,7 +155,7 @@ resubmit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
                dev_err(&mc->intf->dev,
-                       "can't resubmit intr, %s-%s/motorcontrol0, retval %d",
+                       "can't resubmit intr, %s-%s/motorcontrol0, retval %d\n",
                        mc->udev->bus->bus_name,
                        mc->udev->devpath, retval);
 }