diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/wlan-ng/prism2usb.c | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/wlan-ng/prism2usb.c')
| -rw-r--r-- | kernel/drivers/staging/wlan-ng/prism2usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/drivers/staging/wlan-ng/prism2usb.c b/kernel/drivers/staging/wlan-ng/prism2usb.c index e92bbc12b..8abf3f87a 100644 --- a/kernel/drivers/staging/wlan-ng/prism2usb.c +++ b/kernel/drivers/staging/wlan-ng/prism2usb.c @@ -6,7 +6,7 @@ #define PRISM_DEV(vid, pid, name) \ { USB_DEVICE(vid, pid), \ - .driver_info = (unsigned long) name } + .driver_info = (unsigned long)name } static struct usb_device_id usb_prism_tbl[] = { PRISM_DEV(0x04bb, 0x0922, "IOData AirPort WN-B11/USBS"), @@ -136,7 +136,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface) { wlandevice_t *wlandev; - wlandev = (wlandevice_t *) usb_get_intfdata(interface); + wlandev = (wlandevice_t *)usb_get_intfdata(interface); if (wlandev != NULL) { LIST_HEAD(cleanlist); struct list_head *entry; @@ -229,7 +229,7 @@ static int prism2sta_suspend(struct usb_interface *interface, hfa384x_t *hw = NULL; wlandevice_t *wlandev; - wlandev = (wlandevice_t *) usb_get_intfdata(interface); + wlandev = (wlandevice_t *)usb_get_intfdata(interface); if (!wlandev) return -ENODEV; @@ -252,7 +252,7 @@ static int prism2sta_resume(struct usb_interface *interface) hfa384x_t *hw = NULL; wlandevice_t *wlandev; - wlandev = (wlandevice_t *) usb_get_intfdata(interface); + wlandev = (wlandevice_t *)usb_get_intfdata(interface); if (!wlandev) return -ENODEV; |