From: Marek Belisko <marek.belisko@open-nandra.com>
To: gregkh@suse.de
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Marek Belisko <marek.belisko@open-nandra.com>
Subject: [PATCH 01/12] staging: ft1000: Use common return point.
Date: Tue, 25 Jan 2011 12:08:06 +0100 [thread overview]
Message-ID: <1295953697-9805-1-git-send-email-marek.belisko@open-nandra.com> (raw)
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
.../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
next reply other threads:[~2011-01-25 11:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-25 11:08 Marek Belisko [this message]
2011-01-25 11:08 ` [PATCH 02/12] staging: ft1000: Remove dead code Marek Belisko
2011-01-25 11:08 ` [PATCH 03/12] staging: ft1000: Fix coding style Marek Belisko
2011-01-25 11:21 ` Greg KH
2011-01-25 11:08 ` [PATCH 04/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 05/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 06/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 07/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 08/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 09/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 10/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 11/12] " Marek Belisko
2011-01-25 11:08 ` [PATCH 12/12] " Marek Belisko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295953697-9805-1-git-send-email-marek.belisko@open-nandra.com \
--to=marek.belisko@open-nandra.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®