usb-storage: always print quirks

Right now quirks are printed only when the are manually overriden with
the module parameters. It's not so useful to remind the user that his
parameters are correctly applied; what is useful is to print out the
quirks the user is not aware are being applied.

So let's do the smart thing and print the quirks when they are present.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 55c526b81c7c8d2125bc8a4498dfa65280ca9d59..a7d0bf9d92a7529bb59cce521004b41b0960c59c 100644 (file)
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -498,9 +498,6 @@ static void adjust_quirks(struct us_data *us)
                }
        }
        us->fflags = (us->fflags & ~mask) | f;
-       dev_info(&us->pusb_intf->dev, "Quirks match for "
-                       "vid %04x pid %04x: %x\n",
-                       vid, pid, f);
 }
 
 /* Get the unusual_devs entries and the string descriptors */
@@ -535,6 +532,12 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id,
        if (dev->speed != USB_SPEED_HIGH)
                us->fflags &= ~US_FL_GO_SLOW;
 
+       if (us->fflags)
+               dev_info(pdev, "Quirks match for vid %04x pid %04x: %lx\n",
+                               le16_to_cpu(dev->descriptor.idVendor),
+                               le16_to_cpu(dev->descriptor.idProduct),
+                               us->fflags);
+
        /* Log a message if a non-generic unusual_dev entry contains an
         * unnecessary subclass or protocol override.  This may stimulate
         * reports from users that will help us remove unneeded entries