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

Commit 68e9b249 authored by Ali Bahar's avatar Ali Bahar Committed by Greg Kroah-Hartman
Browse files

staging: r8712u: Merging Realtek's latest (v2.6.6). Removed _usb_alloc_urb. 



Replaced (Realtek's) _usb_alloc_urb by (linux's own) usb_alloc_urb.

Signed-off-by: default avatarAli Bahar <ali@internetDog.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7bcd9ce6

drivers/staging/rtl8712/osdep_service.h

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#include "ethernet.h"

#include <linux/if_arp.h>

#include <linux/firmware.h>

#define   _usb_alloc_urb(x, y)       usb_alloc_urb(x, y)

#define   _usb_submit_urb(x, y)     usb_submit_urb(x, y)



struct	__queue	{

drivers/staging/rtl8712/recv_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ int r8712_os_recvbuf_resource_alloc(struct _adapter *padapter, 
	int res = _SUCCESS;



	precvbuf->irp_pending = false;

	precvbuf->purb = _usb_alloc_urb(0, GFP_KERNEL);

	precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);

	if (precvbuf->purb == NULL)

		res = _FAIL;

	precvbuf->pskb = NULL;

drivers/staging/rtl8712/usb_ops_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct zero_bulkout_context { 


uint r8712_usb_init_intf_priv(struct intf_priv *pintfpriv)

{

	pintfpriv->piorw_urb = _usb_alloc_urb(0, GFP_ATOMIC);

	pintfpriv->piorw_urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (!pintfpriv->piorw_urb)

		return _FAIL;

	sema_init(&(pintfpriv->io_retevt), 0);

drivers/staging/rtl8712/xmit_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int r8712_xmit_resource_alloc(struct _adapter *padapter, 
	int i;



	for (i = 0; i < 8; i++) {

		pxmitbuf->pxmit_urb[i] = _usb_alloc_urb(0, GFP_KERNEL);

		pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);

		if (pxmitbuf->pxmit_urb[i] == NULL) {

			printk(KERN_ERR "r8712u: pxmitbuf->pxmit_urb[i]"

			    " == NULL");