4 files changed, 14 insertions, 10 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 821126eb8176..128a804c42f4 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -25,6 +25,7 @@
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/freezer.h>
+#include <linux/random.h>
 
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
@@ -2181,6 +2182,14 @@ int usb_new_device(struct usb_device *udev)
         /* Tell the world! */
         announce_device(udev);
 
+        if (udev->serial)
+                add_device_randomness(udev->serial, strlen(udev->serial));
+        if (udev->product)
+                add_device_randomness(udev->product, strlen(udev->product));
+        if (udev->manufacturer)
+                add_device_randomness(udev->manufacturer,
+                                      strlen(udev->manufacturer));
+
         device_enable_async_suspend(&udev->dev);
 
         /*
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 3d28fb976c78..9fd7886cfa9a 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1836,7 +1836,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         /* init to known state, then setup irqs */
         udc_reset(dev);
         udc_reinit (dev);
-        if (request_irq(pdev->irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/,
+        if (request_irq(pdev->irq, goku_irq, IRQF_SHARED,
                         driver_name, dev) != 0) {
                 DBG(dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 53c093b941e5..907ad3ecb341 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -2201,19 +2201,15 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_ARCH_LUBBOCK
         if (machine_is_lubbock()) {
-                retval = request_irq(LUBBOCK_USB_DISC_IRQ,
-                                lubbock_vbus_irq,
-                                IRQF_SAMPLE_RANDOM,
-                                driver_name, dev);
+                retval = request_irq(LUBBOCK_USB_DISC_IRQ, lubbock_vbus_irq,
+                                     0, driver_name, dev);
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",
                                 driver_name, LUBBOCK_USB_DISC_IRQ, retval);
                         goto err_irq_lub;
                 }
-                retval = request_irq(LUBBOCK_USB_IRQ,
-                                lubbock_vbus_irq,
-                                IRQF_SAMPLE_RANDOM,
-                                driver_name, dev);
+                retval = request_irq(LUBBOCK_USB_IRQ, lubbock_vbus_irq,
+                                     0, driver_name, dev);
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",
                                 driver_name, LUBBOCK_USB_IRQ, retval);
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 575fc815c932..7a88667742b6 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -1576,7 +1576,6 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
                 isp->irq_type = IRQF_TRIGGER_FALLING;
         }
 
-        isp->irq_type |= IRQF_SAMPLE_RANDOM;
         status = request_irq(i2c->irq, isp1301_irq,
                         isp->irq_type, DRIVER_NAME, isp);
         if (status < 0) {