[PATCH resend 01/12] staging: ft1000: Use common return point.

From: Marek Belisko
Date: Tue Jan 25 2011 - 06:30:55 EST


Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
---
.../staging/ft1000/ft1000-usb/ft1000_download.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 17546d8..696e319 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -127,7 +127,7 @@ static u32 check_usb_db (struct ft1000_device *ft1000dev)
{
int loopcnt;
u16 temp;
- u32 status;
+ u32 status, ret_val = HANDSHAKE_MAG_TIMEOUT_VALUE;

loopcnt = 0;
while (loopcnt < 10)
@@ -166,7 +166,8 @@ static u32 check_usb_db (struct ft1000_device *ft1000dev)
else
{
DEBUG("check_usb_db: door bell is cleared, return 0\n");
- return 0;
+ ret_val = 0;
+ break;
}
#if 0
// Check if Card is present
@@ -182,7 +183,7 @@ static u32 check_usb_db (struct ft1000_device *ft1000dev)
#endif
}

- return HANDSHAKE_MAG_TIMEOUT_VALUE;
+ return ret_val;

}

--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/