diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-07-17 02:10:27 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-17 02:10:27 +1000 |
| commit | bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0 (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /drivers/staging/ft1000/ft1000-usb/ft1000_download.c | |
| parent | Merge commit 'v3.15' into next (diff) | |
| parent | Linux 3.16-rc5 (diff) | |
| download | linux-dev-bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0.tar.xz linux-dev-bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0.zip | |
Sync with the changes pushed by Serge in the last merge window.
Diffstat (limited to 'drivers/staging/ft1000/ft1000-usb/ft1000_download.c')
| -rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_download.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c index cab9cdf6273e..65f980167130 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c @@ -522,7 +522,6 @@ static void usb_dnld_complete(struct urb *urb) static int write_blk_fifo(struct ft1000_usb *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length) { - int Status = 0; int byte_length; byte_length = word_length * 4; @@ -547,7 +546,7 @@ static int write_blk_fifo(struct ft1000_usb *ft1000dev, u16 **pUsFile, *pUsFile = *pUsFile + (word_length << 1); *pUcFile = *pUcFile + (word_length << 2); - return Status; + return 0; } static int scram_start_dwnld(struct ft1000_usb *ft1000dev, u16 *hshake, |