2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 105112fb7b57..80cdebcbcb99 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -178,9 +178,9 @@ static int iforce_usb_probe(struct usb_interface *intf,
 
 fail:
         if (iforce) {
-                if (iforce->irq) usb_free_urb(iforce->irq);
-                if (iforce->out) usb_free_urb(iforce->out);
-                if (iforce->ctrl) usb_free_urb(iforce->ctrl);
+                usb_free_urb(iforce->irq);
+                usb_free_urb(iforce->out);
+                usb_free_urb(iforce->ctrl);
                 kfree(iforce);
         }
 
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index ba2a2035d648..7c8d0399ae82 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -297,7 +297,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
 
         serio_raw->dev.minor = PSMOUSE_MINOR;
         serio_raw->dev.name = serio_raw->name;
-        serio_raw->dev.dev = &serio->dev;
+        serio_raw->dev.parent = &serio->dev;
         serio_raw->dev.fops = &serio_raw_fops;
 
         err = misc_register(&serio_raw->dev);