1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 714156ca8fe4..1c8040602525 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -69,7 +69,7 @@
 
 /* gadget stack */
 #include <linux/usb/ch9.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/gadget.h>
 
 /* udc specific */
 #include "amd5536udc.h"
@@ -3244,7 +3244,6 @@ static int udc_pci_probe(
                 retval = -ENOMEM;
                 goto finished;
         }
-        memset(dev, 0, sizeof(struct udc));
 
         /* pci setup */
         if (pci_enable_device(pdev) < 0) {
@@ -3286,14 +3285,12 @@ static int udc_pci_probe(
 
         pci_set_drvdata(pdev, dev);
 
-        /* chip revision */
-        dev->chiprev = 0;
+        /* chip revision for Hs AMD5536 */
+        dev->chiprev = pdev->revision;
 
         pci_set_master(pdev);
         pci_set_mwi(pdev);
 
-        /* chip rev for Hs AMD5536 */
-        pci_read_config_byte(pdev, PCI_REVISION_ID, (u8 *) &dev->chiprev);
         /* init dma pools */
         if (use_dma) {
                 retval = init_dma_pools(dev);