From: Marek Belisko <[email protected]>
Signed-off-by: Marek Belisko <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 49 +++++++++++--------------
1 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index aa4ad7b..6195ee9 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -319,36 +319,31 @@ int ft1000_write_dpram16(struct ft1000_device *ft1000dev,
u16 indx, u16 value, u
// Notes:
//
//---------------------------------------------------------------------------
-int fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8
*buffer)
+int fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx,
+ u8 *buffer)
{
- u8 buf[16];
- u16 pos;
- int ret = STATUS_SUCCESS;
-
- //DEBUG("fix_ft1000_read_dpram32: indx: %d \n", indx);
- pos = (indx / 4)*4;
- ret = ft1000_read_dpram32(ft1000dev, pos, buf, 16);
- if (ret == STATUS_SUCCESS)
- {
- pos = (indx % 4)*4;
- *buffer++ = buf[pos++];
- *buffer++ = buf[pos++];
- *buffer++ = buf[pos++];
- *buffer++ = buf[pos++];
- }
- else
- {
- DEBUG("fix_ft1000_read_dpram32: DPRAM32 Read failed\n");
- *buffer++ = 0;
- *buffer++ = 0;
- *buffer++ = 0;
- *buffer++ = 0;
+ u8 buf[16];
+ u16 pos;
+ int ret = STATUS_SUCCESS;
- }
+ pos = (indx / 4) * 4;
+ ret = ft1000_read_dpram32(ft1000dev, pos, buf, 16);
- //DEBUG("fix_ft1000_read_dpram32: data is %x \n", *buffer);
- return ret;
+ if (ret == STATUS_SUCCESS) {
+ pos = (indx % 4) * 4;
+ *buffer++ = buf[pos++];
+ *buffer++ = buf[pos++];
+ *buffer++ = buf[pos++];
+ *buffer++ = buf[pos++];
+ } else {
+ DEBUG("fix_ft1000_read_dpram32: DPRAM32 Read failed\n");
+ *buffer++ = 0;
+ *buffer++ = 0;
+ *buffer++ = 0;
+ *buffer++ = 0;
+ }
+ return ret;
}
--
1.7.4.1
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
