Merge branch 'master'

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
index 64d55fbd206e..8eadfb705601 100644
--- a/drivers/usb/serial/hp4x.c
+++ b/drivers/usb/serial/hp4x.c
@@ -38,15 +38,17 @@ MODULE_DEVICE_TABLE(usb, id_table);
 
 static struct usb_driver hp49gp_driver = {
         .owner =        THIS_MODULE,
-        .name =         "HP4X",
+        .name =         "hp4X",
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
 };
 
-static struct usb_serial_device_type hp49gp_device = {
-        .owner =                THIS_MODULE,
-        .name =                 "HP4X",
+static struct usb_serial_driver hp49gp_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "hp4X",
+        },
         .id_table =             id_table,
         .num_interrupt_in =     NUM_DONT_CARE,
         .num_bulk_in =          NUM_DONT_CARE,