diff options
| author | Joe Perches <joe@perches.com> | 2010-03-24 22:16:58 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:43 -0700 |
| commit | 62fa452648d3098896bf5a8d78af4f058b355aa0 (patch) | |
| tree | 2c273d1212c0b0b780471fe228a351381df871a1 /drivers/staging/otus/usbdrv.c | |
| parent | 92363b529f2ee08ee3fa14d590058e492ad49a1c (diff) | |
| download | op-kernel-dev-62fa452648d3098896bf5a8d78af4f058b355aa0.zip op-kernel-dev-62fa452648d3098896bf5a8d78af4f058b355aa0.tar.gz | |
Staging: otus: Hoist assign from if
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/usbdrv.c')
| -rw-r--r-- | drivers/staging/otus/usbdrv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/otus/usbdrv.c b/drivers/staging/otus/usbdrv.c index 0ce65b5..165a82b 100644 --- a/drivers/staging/otus/usbdrv.c +++ b/drivers/staging/otus/usbdrv.c @@ -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; |
