diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-28 00:41:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-10-28 00:41:50 +0000 |
| commit | 38ec7b40c175c732920214ea8a3d3dcba653405b (patch) | |
| tree | a66ac8dadfcbdce4a8a0db7fcd9247793d71dfa9 /nuttx/drivers/usbdev/usbdev_scsi.c | |
| parent | 8b9bc3f201869285335e59cc548ce9bc2de2ad9c (diff) | |
| download | px4-nuttx-38ec7b40c175c732920214ea8a3d3dcba653405b.tar.gz px4-nuttx-38ec7b40c175c732920214ea8a3d3dcba653405b.tar.bz2 px4-nuttx-38ec7b40c175c732920214ea8a3d3dcba653405b.zip | |
Remove compile warnings
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1089 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbdev/usbdev_scsi.c')
| -rw-r--r-- | nuttx/drivers/usbdev/usbdev_scsi.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_scsi.c b/nuttx/drivers/usbdev/usbdev_scsi.c index af535c0bc..6cc997d2f 100644 --- a/nuttx/drivers/usbdev/usbdev_scsi.c +++ b/nuttx/drivers/usbdev/usbdev_scsi.c @@ -1332,7 +1332,7 @@ static inline int usbstrg_cmdwrite12(FAR struct usbstrg_dev_s *priv) static int inline usbstrg_setupcmd(FAR struct usbstrg_dev_s *priv, ubyte cdblen, ubyte flags) { - FAR struct usbstrg_lun_s *lun; + FAR struct usbstrg_lun_s *lun = NULL; uint32 datlen; ubyte dir = flags & USBSTRG_FLAGS_DIRMASK; int ret = OK; @@ -1351,17 +1351,13 @@ static int inline usbstrg_setupcmd(FAR struct usbstrg_dev_s *priv, ubyte cdblen, lun = &priv->luntab[priv->cbwlun]; priv->lun = lun; } - else - { - priv->lun = NULL; - /* Only a few commands may specify unsupported LUNs */ + /* Only a few commands may specify unsupported LUNs */ - if ((flags & USBSTRG_FLAGS_LUNNOTNEEDED) == 0) - { - usbtrace(TRACE_CLSERROR(USBSTRG_TRACEERR_CMDBADLUN), priv->cbwlun); - ret = -EINVAL; - } + else if ((flags & USBSTRG_FLAGS_LUNNOTNEEDED) == 0) + { + usbtrace(TRACE_CLSERROR(USBSTRG_TRACEERR_CMDBADLUN), priv->cbwlun); + ret = -EINVAL; } /* Extract the direction and data transfer length */ |