UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: otus: Hoist assign from if 

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Joe Perches 2010-03-24 22:16:58 -07:00 committed by Greg Kroah-Hartman
parent 92363b529f
commit 62fa452648
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/otus/hal/hpmain.c
View File

@ -142,8 +142,9 @@ u16_t zfHpInit(zdev_t* dev, u32_t frequency)
if (wd->modeMDKEnable)
{
/* download the MDK firmware */
if ((ret = zfFirmwareDownload(dev, (u32_t*)zcDKFwImage,
(u32_t)zcDKFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
ret = zfFirmwareDownload(dev, (u32_t*)zcDKFwImage,
(u32_t)zcDKFwImageSize, ZM_FIRMWARE_WLAN_ADDR);
if (ret != ZM_SUCCESS)
{
/* TODO : exception handling */
//return 1;
@ -153,8 +154,9 @@ u16_t zfHpInit(zdev_t* dev, u32_t frequency)
{
#ifndef ZM_OTUS_LINUX_PHASE_2
/* download the normal firmware */
if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
(u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
(u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR);
if (ret != ZM_SUCCESS)
{
/* TODO : exception handling */
//return 1;
@ -162,16 +164,18 @@ u16_t zfHpInit(zdev_t* dev, u32_t frequency)
#else
// 1-PH fw: ReadMac() store some global variable
if ((ret = zfFirmwareDownloadNotJump(dev, (u32_t*)zcFwBufImage,
(u32_t)zcFwBufImageSize, 0x102800)) != ZM_SUCCESS)
ret = zfFirmwareDownloadNotJump(dev, (u32_t*)zcFwBufImage,
(u32_t)zcFwBufImageSize, 0x102800);
if (ret != ZM_SUCCESS)
{
DbgPrint("Dl zcFwBufImage failed!");
}
zfwSleep(dev, 1000);
if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
(u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
(u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR);
if (ret != ZM_SUCCESS)
{
DbgPrint("Dl zcFwBufImage failed!");
}
@ -249,15 +253,17 @@ u16_t zfHpReinit(zdev_t* dev, u32_t frequency)
#ifndef ZM_OTUS_LINUX_PHASE_2
/* Download firmware */
if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
(u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
(u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR);
if (ret != ZM_SUCCESS)
{
/* TODO : exception handling */
//return 1;
}
#else
if ((ret = zfFirmwareDownload(dev, (u32_t*)zcP2FwImage,
(u32_t)zcP2FwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
ret = zfFirmwareDownload(dev, (u32_t*)zcP2FwImage,
(u32_t)zcP2FwImageSize, ZM_FIRMWARE_WLAN_ADDR);
if (ret != ZM_SUCCESS)
{
/* TODO : exception handling */
//return 1;

6
drivers/staging/otus/usbdrv.c
View File

@ -350,7 +350,8 @@ int usbdrv_open(struct net_device *dev)
}
size = zfiGlobalDataSize(dev);
if ((mem = kmalloc(size, GFP_KERNEL)) == NULL)
mem = kmalloc(size, GFP_KERNEL);
if (mem == NULL)
{
rc = -EBUSY;
goto exit;
@ -698,7 +699,8 @@ void usbdrv_remove1(struct pci_dev *pcid)
struct net_device *dev;
struct usbdrv_private *macp;
if (!(dev = (struct net_device *) pci_get_drvdata(pcid)))
dev = (struct net_device *)pci_get_drvdata(pcid);
if (!dev)
return;
macp = dev->ml_priv;

3
drivers/staging/otus/zdusb.c
View File

@ -95,7 +95,8 @@ static int zfLnxProbe(struct usb_interface *interface,
printk(KERN_NOTICE "USB 1.1 Host\n");
#endif
if (!(macp = kmalloc(sizeof(struct usbdrv_private), GFP_KERNEL)))
macp = kmalloc(sizeof(struct usbdrv_private), GFP_KERNEL);
if (!macp)
{
printk(KERN_ERR "out of memory allocating device structure\n");
result = -ENOMEM;