2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index c51f8e9312e0..7c3aaa9c5402 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -91,8 +91,8 @@ static int usb_create_newid_file(struct usb_driver *usb_drv)
                 goto exit;
 
         if (usb_drv->probe != NULL)
-                error = sysfs_create_file(&usb_drv->drvwrap.driver.kobj,
-                                          &driver_attr_new_id.attr);
+                error = driver_create_file(&usb_drv->drvwrap.driver,
+                                           &driver_attr_new_id);
 exit:
         return error;
 }
@@ -103,8 +103,8 @@ static void usb_remove_newid_file(struct usb_driver *usb_drv)
                 return;
 
         if (usb_drv->probe != NULL)
-                sysfs_remove_file(&usb_drv->drvwrap.driver.kobj,
-                                  &driver_attr_new_id.attr);
+                driver_remove_file(&usb_drv->drvwrap.driver,
+                                   &driver_attr_new_id);
 }
 
 static void usb_free_dynids(struct usb_driver *usb_drv)
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index feba9679ace8..7c069a02c1dd 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -447,7 +447,7 @@ static void	usa26_indat_callback(struct urb *urb)
 
         port = (struct usb_serial_port *) urb->context;
         tty = port->tty;
-        if (urb->actual_length) {
+        if (tty && urb->actual_length) {
                 /* 0x80 bit is error flag */
                 if ((data[0] & 0x80) == 0) {
                         /* no errors on individual bytes, only possible overrun err*/