[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <BANLkTikPgm7kpaoofVSkJCBXYyea4HeB8A@mail.gmail.com>
Date: Sat, 7 May 2011 12:27:58 +0300
From: Maxin John <maxin.john@...il.com>
To: Greg KH <greg@...ah.com>
Cc: Michal Nazarewicz <mina86@...a86.com>, gregkh@...e.de,
stern@...land.harvard.edu, m-sonasath@...com,
linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
roger.quadros@...ia.com
Subject: Re: [PATCH] usb: gadget: f_mass_storage: Remove the LUN check which
is always true
Hi Greg,
>> Please find the patch for "file_storage.c" below. Should I merge these
>> two patches and re-submit as a single one?
>
> Yes please.
As per your suggestion, please find the merged patch below:
Signed-off-by: Maxin B. John <maxin.john@...il.com>
Acked-by: Michal Nazarewicz <mina86@...a86.com>
Acked-by: Alan Stern <stern@...land.harvard.edu>
---
diff --git a/drivers/usb/gadget/f_mass_storage.c
b/drivers/usb/gadget/f_mass_storage.c
index 6d8e533..cade79e 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -1910,7 +1910,7 @@ static int check_command(struct fsg_common
*common, int cmnd_size,
common->lun, lun);
/* Check the LUN */
- if (common->lun >= 0 && common->lun < common->nluns) {
+ if (common->lun < common->nluns) {
curlun = &common->luns[common->lun];
common->curlun = curlun;
if (common->cmnd[0] != REQUEST_SENSE) {
diff --git a/drivers/usb/gadget/file_storage.c
b/drivers/usb/gadget/file_storage.c
index a6eacb5..a9c5177 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -2314,7 +2314,7 @@ static int check_command(struct fsg_dev *fsg,
int cmnd_size,
fsg->lun = lun; // Use LUN from the command
/* Check the LUN */
- if (fsg->lun >= 0 && fsg->lun < fsg->nluns) {
+ if (fsg->lun < fsg->nluns) {
fsg->curlun = curlun = &fsg->luns[fsg->lun];
if (fsg->cmnd[0] != REQUEST_SENSE) {
curlun->sense_data = SS_NO_SENSE;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists