luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct handling of GETMAXLUN request

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1087 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-10-28 00:30:42 +00:00
parent 05f8581874
commit 49390ac335
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/usbdev/usbdev_storage.c
View file

@ -22,6 +22,9 @@
* "SCSI Block Commands -2 (SBC-2)," American National Standard
* for Information Technology, November 13, 2004
*
* "SCSI Multimedia Commands - 3 (MMC-3)," American National Standard
* for Information Technology, November 12, 2001
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@ -193,8 +196,8 @@ static const struct usb_ifdesc_s g_ifdesc =
{
USB_SIZEOF_IFDESC, /* len */
USB_DESC_TYPE_INTERFACE, /* type */
0, /* ifno */
0, /* alt */
USBSTRG_INTERFACEID, /* ifno */
USBSTRG_ALTINTERFACEID, /* alt */
USBSTRG_NENDPOINTS, /* neps */
USB_CLASS_MASS_STORAGE, /* class */
SUBSTRG_SUBCLASS_SCSI, /* subclass */
@ -942,11 +945,11 @@ static int usbstrg_setup(FAR struct usbdev_s *dev, const struct usb_ctrlreq_s *c
case USBSTRG_REQ_GETMAXLUN: /* Return number LUNs supported */
{
if (ctrl->type != USBSTRG_TYPE_SETUPIN && value == 0)
if (ctrl->type == USBSTRG_TYPE_SETUPIN && value == 0)
{
/* Only one interface is supported */
if (index != USBSTRG_CONFIGID)
if (index != USBSTRG_INTERFACEID)
{
usbtrace(TRACE_CLSERROR(USBSTRG_TRACEERR_GETMAXLUNNDX), index);
ret = -EDOM;