USB: remove err() macro from usb core code

[linux-2.6-omap-h63xx.git] / drivers / usb / misc / appledisplay.c

diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index a5e4c3545c72a4194921cc3f1ec138b1dc5b465f..71d672ea12294a20ddea55b65645c1ca5de0ef17 100644 (file)
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -103,11 +103,11 @@ static void appledisplay_complete(struct urb *urb)
        case -ESHUTDOWN:
                /* This urb is terminated, clean up */
                dbg("%s - urb shuttingdown with status: %d",
-                       __FUNCTION__, status);
+                       __func__, status);
                return;
        default:
                dbg("%s - nonzero urb status received: %d",
-                       __FUNCTION__, status);
+                       __func__, status);
                goto exit;
        }
 
@@ -131,7 +131,7 @@ exit:
        retval = usb_submit_urb(pdata->urb, GFP_ATOMIC);
        if (retval) {
                err("%s - usb_submit_urb failed with result %d",
-                       __FUNCTION__, retval);
+                       __func__, retval);
        }
 }
 
@@ -314,7 +314,7 @@ error:
                                        pdata->urbdata, pdata->urb->transfer_dma);
                        usb_free_urb(pdata->urb);
                }
-               if (pdata->bd)
+               if (pdata->bd && !IS_ERR(pdata->bd))
                        backlight_device_unregister(pdata->bd);
                kfree(pdata->msgdata);
        }