dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Staging: rt2870: Hoist assign from if 

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Joe Perches 2010-03-24 22:17:00 -07:00 committed by Greg Kroah-Hartman
parent 6aed5295ae
commit 699910dd75
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/rt2870/common/rtusb_bulk.c
View File

@ -474,7 +474,8 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
(usb_complete_t) RTUSBBulkOutDataPacketComplete);
pUrb = pHTTXContext->pUrb;
if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
ret = RTUSB_SUBMIT_URB(pUrb);
if (ret != 0) {
DBGPRINT(RT_DEBUG_ERROR,
("RTUSBBulkOutDataPacket: Submit Tx URB failed %d\n",
ret));
@ -572,7 +573,8 @@ void RTUSBBulkOutNullFrame(struct rt_rtmp_adapter *pAd)
(usb_complete_t) RTUSBBulkOutNullFrameComplete);
pUrb = pNullContext->pUrb;
if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
ret = RTUSB_SUBMIT_URB(pUrb);
if (ret != 0) {
RTMP_IRQ_LOCK(&pAd->BulkOutLock[0], IrqFlags);
pAd->BulkOutPending[0] = FALSE;
pAd->watchDogTxPendingCnt[0] = 0;
@ -666,7 +668,8 @@ void RTUSBBulkOutMLMEPacket(struct rt_rtmp_adapter *pAd, u8 Index)
pUrb->transfer_flags &= (~URB_NO_TRANSFER_DMA_MAP);
pUrb = pMLMEContext->pUrb;
if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
ret = RTUSB_SUBMIT_URB(pUrb);
if (ret != 0) {
DBGPRINT(RT_DEBUG_ERROR,
("RTUSBBulkOutMLMEPacket: Submit MLME URB failed %d\n",
ret));
@ -741,7 +744,8 @@ void RTUSBBulkOutPsPoll(struct rt_rtmp_adapter *pAd)
(usb_complete_t) RTUSBBulkOutPsPollComplete);
pUrb = pPsPollContext->pUrb;
if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
ret = RTUSB_SUBMIT_URB(pUrb);
if (ret != 0) {
RTMP_IRQ_LOCK(&pAd->BulkOutLock[0], IrqFlags);
pAd->BulkOutPending[0] = FALSE;
pAd->watchDogTxPendingCnt[0] = 0;
@ -798,7 +802,8 @@ void DoBulkIn(struct rt_rtmp_adapter *pAd)
RTUSBInitRxDesc(pAd, pRxContext);
pUrb = pRxContext->pUrb;
if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) { /* fail */
ret = RTUSB_SUBMIT_URB(pUrb);
if (ret != 0) { /* fail */
RTMP_IRQ_LOCK(&pAd->BulkInLock, IrqFlags);
pRxContext->InUse = FALSE;

10
drivers/staging/rt2870/common/rtusb_io.c
View File

@ -1167,11 +1167,10 @@ void CMDHandler(struct rt_rtmp_adapter *pAd)
(usb_complete_t)
RTUSBBulkOutDataPacketComplete);
if ((ret =
RTUSB_SUBMIT_URB
ret = RTUSB_SUBMIT_URB
(pHTTXContext->
pUrb)) !=
0) {
pUrb);
if (ret != 0) {
RTMP_INT_LOCK
(&pAd->
BulkOutLock
@ -1540,7 +1539,8 @@ void CMDHandler(struct rt_rtmp_adapter *pAd)
RTUSBInitRxDesc(pAd,
pRxContext);
pUrb = pRxContext->pUrb;
if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) { /* fail */
ret = RTUSB_SUBMIT_URB(pUrb);
if (ret != 0) { /* fail */
RTMP_IRQ_LOCK
(&pAd->