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

Commit 302d37a4 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_submit_urb. 



Replaced (Realtek's) _usb_submit_urb by (linux's own) usb_submit_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 68e9b249

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_submit_urb(x, y)     usb_submit_urb(x, y)



struct	__queue	{

	struct	list_head	queue;

drivers/staging/rtl8712/usb_ops_linux.c

+3 −3
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) 
	usb_fill_bulk_urb(piorw_urb, pusbd, pipe,

			  wmem, cnt, usb_write_mem_complete,

			  pio_queue);

	status = _usb_submit_urb(piorw_urb, GFP_ATOMIC);

	status = usb_submit_urb(piorw_urb, GFP_ATOMIC);

	_down_sema(&pintfpriv->io_retevt);

}
@@ -305,7 +305,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) 
				  precvbuf->pbuf, MAX_RECVBUF_SZ,

				  r8712_usb_read_port_complete,

				  precvbuf);

		err = _usb_submit_urb(purb, GFP_ATOMIC);

		err = usb_submit_urb(purb, GFP_ATOMIC);

		if ((err) && (err != (-EPERM)))

			ret = _FAIL;

	} else
@@ -462,7 +462,7 @@ u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) 
			  pxmitframe->mem_addr,

			  cnt, usb_write_port_complete,

			  pxmitframe); /* context is xmit_frame */

	status = _usb_submit_urb(purb, GFP_ATOMIC);

	status = usb_submit_urb(purb, GFP_ATOMIC);

	if (!status)

		ret = _SUCCESS;

	else