[XFS] Fix merge failures

[pandora-kernel.git] / drivers / isdn / gigaset / usb-gigaset.c

diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 77d20ab..fba61f6 100644 (file)
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -407,7 +407,7 @@ static void gigaset_read_int_callback(struct urb *urb)
        spin_lock_irqsave(&cs->lock, flags);
        if (!cs->connected) {
                spin_unlock_irqrestore(&cs->lock, flags);
-               err("%s: disconnected", __func__);
+               pr_err("%s: disconnected\n", __func__);
                return;
        }
        r = usb_submit_urb(urb, GFP_ATOMIC);
@@ -440,7 +440,7 @@ static void gigaset_write_bulk_callback(struct urb *urb)
 
        spin_lock_irqsave(&cs->lock, flags);
        if (!cs->connected) {
-               err("%s: not connected", __func__);
+               pr_err("%s: disconnected\n", __func__);
        } else {
                cs->hw.usb->busy = 0;
                tasklet_schedule(&cs->write_tasklet);
@@ -498,8 +498,9 @@ static int send_cb(struct cardstate *cs, struct cmdbuf_t *cb)
 
                        if (status) {
                                ucs->busy = 0;
-                               err("could not submit urb (error %d)\n",
-                                   -status);
+                               dev_err(cs->dev,
+                                       "could not submit urb (error %d)\n",
+                                       -status);
                                cb->len = 0; /* skip urb => remove cb+wakeup
                                                in next loop cycle */
                        }
@@ -611,8 +612,10 @@ static int gigaset_initcshw(struct cardstate *cs)
 
        cs->hw.usb = ucs =
                kmalloc(sizeof(struct usb_cardstate), GFP_KERNEL);
-       if (!ucs)
+       if (!ucs) {
+               pr_err("out of memory\n");
                return 0;
+       }
 
        ucs->bchars[0] = 0;
        ucs->bchars[1] = 0;
@@ -670,7 +673,7 @@ static int write_modem(struct cardstate *cs)
        spin_unlock_irqrestore(&cs->lock, flags);
 
        if (ret) {
-               err("could not submit urb (error %d)\n", -ret);
+               dev_err(cs->dev, "could not submit urb (error %d)\n", -ret);
                ucs->busy = 0;
        }
 
@@ -935,13 +938,11 @@ static int __init usb_gigaset_init(void)
        /* register this driver with the USB subsystem */
        result = usb_register(&gigaset_usb_driver);
        if (result < 0) {
-               err("usb_gigaset: usb_register failed (error %d)",
-                   -result);
+               pr_err("error %d registering USB driver\n", -result);
                goto error;
        }
 
-       info(DRIVER_AUTHOR);
-       info(DRIVER_DESC);
+       pr_info(DRIVER_DESC "\n");
        return 0;
 
 error: