| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 7 Mar 2011 09:21:23 +0100
From: Marek Belisko <marek.belisko@...n-nandra.com>
To: gregkh@...e.de
Cc: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Marek Belisko <marek.belisko@...n-nandra.com>
Subject: [PATCH 18/21] staging: ft1000: Fix coding style in ft1000_chkcard function.
Signed-off-by: Marek Belisko <marek.belisko@...n-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 61 +++++++++++++------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index a76e380..5fdfbbd 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -1325,40 +1325,41 @@ Jim
// TRUE (device is present)
//
//---------------------------------------------------------------------------
-static int ft1000_chkcard (struct ft1000_device *dev) {
- u16 tempword;
- u16 status;
+static int ft1000_chkcard(struct ft1000_device *dev)
+{
+ u16 tempword;
+ u16 status;
struct ft1000_info *info = netdev_priv(dev->net);
- if (info->fCondResetPend)
- {
- DEBUG("ft1000_hw:ft1000_chkcard:Card is being reset, return FALSE\n");
- return TRUE;
- }
-
- // Mask register is used to check for device presence since it is never
- // set to zero.
- status = ft1000_read_register(dev, &tempword, FT1000_REG_SUP_IMASK);
- //DEBUG("ft1000_hw:ft1000_chkcard: read FT1000_REG_SUP_IMASK = %x\n", tempword);
- if (tempword == 0) {
- DEBUG("ft1000_hw:ft1000_chkcard: IMASK = 0 Card not detected\n");
- return FALSE;
- }
-
- // The system will return the value of 0xffff for the version register
- // if the device is not present.
- status = ft1000_read_register(dev, &tempword, FT1000_REG_ASIC_ID);
- //DEBUG("ft1000_hw:ft1000_chkcard: read FT1000_REG_ASIC_ID = %x\n", tempword);
- if (tempword != 0x1b01 ){
- dev->status |= FT1000_STATUS_CLOSING; //mbelian
- DEBUG("ft1000_hw:ft1000_chkcard: Version = 0xffff Card not detected\n");
- return FALSE;
- }
- return TRUE;
+ if (info->fCondResetPend) {
+ DEBUG
+ ("ft1000_hw:ft1000_chkcard:Card is being reset, return FALSE\n");
+ return TRUE;
+ }
+ /* Mask register is used to check for device presence since it is never
+ * set to zero.
+ */
+ status = ft1000_read_register(dev, &tempword, FT1000_REG_SUP_IMASK);
+ //DEBUG("ft1000_hw:ft1000_chkcard: read FT1000_REG_SUP_IMASK = %x\n", tempword);
+ if (tempword == 0) {
+ DEBUG
+ ("ft1000_hw:ft1000_chkcard: IMASK = 0 Card not detected\n");
+ return FALSE;
+ }
+ /* The system will return the value of 0xffff for the version register
+ * if the device is not present.
+ */
+ status = ft1000_read_register(dev, &tempword, FT1000_REG_ASIC_ID);
+ //DEBUG("ft1000_hw:ft1000_chkcard: read FT1000_REG_ASIC_ID = %x\n", tempword);
+ if (tempword != 0x1b01) {
+ dev->status |= FT1000_STATUS_CLOSING; //mbelian
+ DEBUG
+ ("ft1000_hw:ft1000_chkcard: Version = 0xffff Card not detected\n");
+ return FALSE;
+ }
+ return TRUE;
}
-
-
//---------------------------------------------------------------------------
//
// Function: ft1000_receive_cmd
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists