Patch from Chris Rankin:
It looks like someone has removed the register argument from the USB callback functions again. This patch is against the latest SVN repository.
This commit is contained in:
parent
8f4ba7c7d5
commit
e7f8fea57b
1
CHANGES
1
CHANGES
|
@ -41,6 +41,7 @@
|
|||
* Intersil Corporation as part of PRISM(R) chipset product development.
|
||||
*
|
||||
* --------------------------------------------------------------------
|
||||
- pt_regs is gone for USB as well on 2.6.19+ (Chris Rankin)
|
||||
- Large WEXT patch that allows use of NetworkManager. (Richard Kennedy)
|
||||
0.2.7
|
||||
- Fix license text in prism2dl.c (it is in fact MPL/GPL)
|
||||
|
|
|
@ -281,6 +281,10 @@ typedef int64_t INT64;
|
|||
|
||||
#if defined(__KERNEL__)
|
||||
|
||||
#if ((LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)))
|
||||
#define URB_ONLY_CALLBACK
|
||||
#endif
|
||||
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
|
||||
#define PT_REGS , struct pt_regs *regs
|
||||
#else
|
||||
|
|
|
@ -257,7 +257,7 @@ submit_tx_urb(hfa384x_t *hw, struct urb *tx_urb, int flags);
|
|||
|
||||
/*---------------------------------------------------*/
|
||||
/* Callbacks */
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
|
||||
#ifdef URB_ONLY_CALLBACK
|
||||
static void
|
||||
hfa384x_usbout_callback(struct urb *urb);
|
||||
static void
|
||||
|
@ -3847,7 +3847,7 @@ hfa384x_usbctlxq_run(hfa384x_t *hw)
|
|||
* Call context:
|
||||
* interrupt
|
||||
----------------------------------------------------------------*/
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
|
||||
#ifdef URB_ONLY_CALLBACK
|
||||
void hfa384x_usbin_callback(struct urb *urb)
|
||||
#else
|
||||
void hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs)
|
||||
|
@ -4506,7 +4506,7 @@ void hfa384x_usbin_info(wlandevice_t *wlandev, hfa384x_usbin_t *usbin)
|
|||
* Call context:
|
||||
* interrupt
|
||||
----------------------------------------------------------------*/
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
|
||||
#ifdef URB_ONLY_CALLBACK
|
||||
void hfa384x_usbout_callback(struct urb *urb)
|
||||
#else
|
||||
void hfa384x_usbout_callback(struct urb *urb, struct pt_regs *regs)
|
||||
|
@ -4587,7 +4587,7 @@ void hfa384x_usbout_callback(struct urb *urb, struct pt_regs *regs)
|
|||
* Call context:
|
||||
* interrupt
|
||||
----------------------------------------------------------------*/
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
|
||||
#ifdef URB_ONLY_CALLBACK
|
||||
void hfa384x_ctlxout_callback(struct urb *urb)
|
||||
#else
|
||||
void hfa384x_ctlxout_callback(struct urb *urb, struct pt_regs *regs)
|
||||
|
|
Loading…
Reference in New Issue