aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/storage/usb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 55c526b81c7c..a7d0bf9d92a7 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -498,9 +498,6 @@ static void adjust_quirks(struct us_data *us)
498 } 498 }
499 } 499 }
500 us->fflags = (us->fflags & ~mask) | f; 500 us->fflags = (us->fflags & ~mask) | f;
501 dev_info(&us->pusb_intf->dev, "Quirks match for "
502 "vid %04x pid %04x: %x\n",
503 vid, pid, f);
504} 501}
505 502
506/* Get the unusual_devs entries and the string descriptors */ 503/* 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,
535 if (dev->speed != USB_SPEED_HIGH) 532 if (dev->speed != USB_SPEED_HIGH)
536 us->fflags &= ~US_FL_GO_SLOW; 533 us->fflags &= ~US_FL_GO_SLOW;
537 534
535 if (us->fflags)
536 dev_info(pdev, "Quirks match for vid %04x pid %04x: %lx\n",
537 le16_to_cpu(dev->descriptor.idVendor),
538 le16_to_cpu(dev->descriptor.idProduct),
539 us->fflags);
540
538 /* Log a message if a non-generic unusual_dev entry contains an 541 /* Log a message if a non-generic unusual_dev entry contains an
539 * unnecessary subclass or protocol override. This may stimulate 542 * unnecessary subclass or protocol override. This may stimulate
540 * reports from users that will help us remove unneeded entries 543 * reports from users that will help us remove unneeded entries