diff --git a/[refs] b/[refs] index a6c597962f14..88868c340821 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7af0786303cfb6c541582839275f1d0addbeb2b +refs/heads/master: dfc9539fe88fe548184563d77f1816782289ac1e diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c index 7c4749ae1ea3..1797c4da91df 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_download.c @@ -1072,16 +1072,8 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart, image < file_hdr->nDspImages; image++) { - temp = - (u16) (dsp_img_info-> - version); - templong = temp; - temp = - (u16) (dsp_img_info-> - version >> 16); - templong |= (temp << 16); - if (templong == - (u32) requested_version) { + if (dsp_img_info->version == + requested_version) { correct_version = TRUE; DEBUG ("FT1000:download: correct_version is TRUE\n");