summaryrefslogtreecommitdiff
path: root/nuttx/drivers
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-12 07:55:53 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-12 07:55:53 -0600
commitf6ff3be5855a5bdec6b0335bb0670f55c928478b (patch)
tree7dfd307810fd46c89eabb02f114b88116f045698 /nuttx/drivers
parenta68c8c07e7965280b0b4c3ff0e29f7304c0db163 (diff)
downloadpx4-nuttx-f6ff3be5855a5bdec6b0335bb0670f55c928478b.tar.gz
px4-nuttx-f6ff3be5855a5bdec6b0335bb0670f55c928478b.tar.bz2
px4-nuttx-f6ff3be5855a5bdec6b0335bb0670f55c928478b.zip
usbdev: usbmsc_scsi: Add NULL pointer check. From Juha Niskanen
Diffstat (limited to 'nuttx/drivers')
-rw-r--r--nuttx/drivers/usbdev/usbmsc_scsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/drivers/usbdev/usbmsc_scsi.c b/nuttx/drivers/usbdev/usbmsc_scsi.c
index 0c699bf6b..fd8a5340a 100644
--- a/nuttx/drivers/usbdev/usbmsc_scsi.c
+++ b/nuttx/drivers/usbdev/usbmsc_scsi.c
@@ -1457,7 +1457,7 @@ static int inline usbmsc_setupcmd(FAR struct usbmsc_dev_s *priv,
{
FAR struct usbmsc_lun_s *lun = NULL;
uint32_t datlen;
- uint8_t dir = flags & USBMSC_FLAGS_DIRMASK;
+ uint8_t dir;
int ret = OK;
/* Verify the LUN and set up the current LUN reference in the
@@ -1528,7 +1528,7 @@ static int inline usbmsc_setupcmd(FAR struct usbmsc_dev_s *priv,
{
priv->u.alloclen = priv->cbwlen;
}
- else
+ else if (lun)
{
priv->u.xfrlen = priv->cbwlen / lun->sectorsize;
}