Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 707eefb8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: otus: fix urb callback function type 



The #ifdef for version checking is wrong, and we no longer
pass the struct pt_regs to the urb callback functions.  This
patch fixes this error.

Cc: Luis Rodriguez <Luis.Rodriguez@Atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 063e95c7

drivers/staging/otus/wwrap.c

+0 −16
Original line number Diff line number Diff line
@@ -259,11 +259,7 @@ u32_t zfLnxPutUsbRxBuffer(zdev_t *dev, zbuf_t *buf) 
    return 0;

}



#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))

void zfLnxUsbDataOut_callback(urb_t *urb)

#else

void zfLnxUsbDataOut_callback(urb_t *urb, struct pt_regs *regs)

#endif

{

    zdev_t* dev = urb->context;

    //UsbTxQ_t *TxData;
@@ -289,11 +285,7 @@ void zfLnxUsbDataOut_callback(urb_t *urb, struct pt_regs *regs) 
    }

}



#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))

void zfLnxUsbDataIn_callback(urb_t *urb)

#else

void zfLnxUsbDataIn_callback(urb_t *urb, struct pt_regs *regs)

#endif

{

    zdev_t* dev = urb->context;

    struct usbdrv_private *macp = dev->ml_priv;
@@ -526,22 +518,14 @@ void zfLnxUsbDataIn_callback(urb_t *urb, struct pt_regs *regs) 
#endif

}



#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))

void zfLnxUsbRegOut_callback(urb_t *urb)

#else

void zfLnxUsbRegOut_callback(urb_t *urb, struct pt_regs *regs)

#endif

{

    //dev_t* dev = urb->context;



    //printk(KERN_ERR "zfwUsbRegOut_callback\n");

}



#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))

void zfLnxUsbRegIn_callback(urb_t *urb)

#else

void zfLnxUsbRegIn_callback(urb_t *urb, struct pt_regs *regs)

#endif

{

    zdev_t* dev = urb->context;

    u32_t rsp[64/4];