lkml.org 
[lkml]   [2012]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the vfs tree with Linus' tree
Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
drivers/staging/gdm72xx/usb_boot.c between commit d67030d215ac
("staging/gdm72xx: return PTR_ERR rather -ENOENT") from Linus' tree and
commit 09fada5b5f1f ("slightly reduce lossage in gdm72xx") from the vfs
tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/gdm72xx/usb_boot.c
index fef290c,b366a54..0000000
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@@ -173,8 -174,7 +173,7 @@@ int usb_boot(struct usb_device *usbdev
filp = filp_open(img_name, O_RDONLY | O_LARGEFILE, 0);
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;
}
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-07-30 02:41    [from the cache]
©2003-2011 Jasper Spaans