Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / drivers / staging / gdm72xx / usb_boot.c

diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
index 5a0e030220dc26a87d64eeb57f15cf59be8dd533..fef290c38db67ae8620a8ff92179275fb564730b 100644 (file)
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@ -13,7 +13,6 @@
 
 #include <linux/uaccess.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/usb.h>
@@ -175,7 +174,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
        if (IS_ERR(filp)) {
                printk(KERN_ERR "Can't find %s.\n", img_name);
                set_fs(fs);
-               ret = -ENOENT;
+               ret = PTR_ERR(filp);
                goto restore_fs;
        }