Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / usb / misc / uss720.c

diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 4081990..2734fe2 100644 (file)
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -106,17 +106,18 @@ static void destroy_async(struct kref *kref)
 
 /* --------------------------------------------------------------------- */
 
-static void async_complete(struct urb *urb, struct pt_regs *ptregs)
+static void async_complete(struct urb *urb)
 {
        struct uss720_async_request *rq;
        struct parport *pp;
        struct parport_uss720_private *priv;
+       int status = urb->status;
 
        rq = urb->context;
        priv = rq->priv;
        pp = priv->pp;
-       if (urb->status) {
-               err("async_complete: urb error %d", urb->status);
+       if (status) {
+               err("async_complete: urb error %d", status);
        } else if (rq->dr.bRequest == 3) {
                memcpy(priv->reg, rq->reg, sizeof(priv->reg));
 #if 0
@@ -127,7 +128,7 @@ static void async_complete(struct urb *urb, struct pt_regs *ptregs)
 #endif
                /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
                if (rq->reg[2] & rq->reg[1] & 0x10 && pp)
-                       parport_generic_irq(0, pp, NULL);
+                       parport_generic_irq(0, pp);
        }
        complete(&rq->compl);
        kref_put(&rq->ref_count, destroy_async);
@@ -336,7 +337,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id)
        memcpy(priv->reg, buffer, 4);
        /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
        if (priv->reg[2] & priv->reg[1] & 0x10)
-               parport_generic_irq(0, pp, NULL);
+               parport_generic_irq(0, pp);
        return 1;
 }
 #endif
@@ -705,7 +706,7 @@ static int uss720_probe(struct usb_interface *intf,
        /*
         * Allocate parport interface 
         */
-       if (!(priv = kcalloc(sizeof(struct parport_uss720_private), 1, GFP_KERNEL))) {
+       if (!(priv = kzalloc(sizeof(struct parport_uss720_private), GFP_KERNEL))) {
                usb_put_dev(usbdev);
                return -ENOMEM;
        }