From 4e8b1e84b1b915d9dec66d82c10aaec93396cd55 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 22 Jul 2012 21:09:14 +0400
Subject: [PATCH] --- yaml --- r: 320959 b: refs/heads/master c:
 09fada5b5f1f56502bb14f36a69a2c31cea262be h: refs/heads/master i:   320957:
 afdac98481760bea1381581cdaa58c1a79778965   320955:
 4432c26a1b8a73a9acd143a06e5603b6f2f41861   320951:
 f5acc415e98f3900628783e77ecbefecade15451   320943:
 0b996784aa0daf713fc964e3c6824fff9561bd90   320927:
 afe7b96ddb910f74a473d1b62fdaa7a116ead3e1   320895:
 d0c996101a12e3fe3da10e9c4228b937dc9f4d30 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/gdm72xx/sdio_boot.c |  7 +++----
 trunk/drivers/staging/gdm72xx/usb_boot.c  | 22 +++++++++-------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 178fb2b18ae5..958eb548c6f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32aecdd36528449cec34e6e63dcd5f0221ca7b43
+refs/heads/master: 09fada5b5f1f56502bb14f36a69a2c31cea262be
diff --git a/trunk/drivers/staging/gdm72xx/sdio_boot.c b/trunk/drivers/staging/gdm72xx/sdio_boot.c
index 6ff4dc372522..5d484793c2e7 100644
--- a/trunk/drivers/staging/gdm72xx/sdio_boot.c
+++ b/trunk/drivers/staging/gdm72xx/sdio_boot.c
@@ -67,9 +67,8 @@ static int download_image(struct sdio_func *func, char *img_name)
 		return -ENOENT;
 	}
 
-	if (filp->f_dentry)
-		inode = filp->f_dentry->d_inode;
-	if (!inode || !S_ISREG(inode->i_mode)) {
+	inode = filp->f_dentry->d_inode;
+	if (!S_ISREG(inode->i_mode)) {
 		printk(KERN_ERR "Invalid file type: %s\n", img_name);
 		ret = -EINVAL;
 		goto out;
@@ -124,7 +123,7 @@ static int download_image(struct sdio_func *func, char *img_name)
 		pno++;
 	}
 out:
-	filp_close(filp, current->files);
+	filp_close(filp, NULL);
 	return ret;
 }
 
diff --git a/trunk/drivers/staging/gdm72xx/usb_boot.c b/trunk/drivers/staging/gdm72xx/usb_boot.c
index 5a0e030220dc..b366a54386fb 100644
--- a/trunk/drivers/staging/gdm72xx/usb_boot.c
+++ b/trunk/drivers/staging/gdm72xx/usb_boot.c
@@ -174,14 +174,12 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
 	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;
 		goto restore_fs;
 	}
 
-	if (filp->f_dentry)
-		inode = filp->f_dentry->d_inode;
-	if (!inode || !S_ISREG(inode->i_mode)) {
+	inode = filp->f_dentry->d_inode;
+	if (!S_ISREG(inode->i_mode)) {
 		printk(KERN_ERR "Invalid file type: %s\n", img_name);
 		ret = -EINVAL;
 		goto out;
@@ -263,7 +261,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
 		ret = -EINVAL;
 	}
 out:
-	filp_close(filp, current->files);
+	filp_close(filp, NULL);
 
 restore_fs:
 	set_fs(fs);
@@ -323,13 +321,11 @@ static int em_download_image(struct usb_device *usbdev, char *path,
 		goto restore_fs;
 	}
 
-	if (filp->f_dentry) {
-		inode = filp->f_dentry->d_inode;
-		if (!inode || !S_ISREG(inode->i_mode)) {
-			printk(KERN_ERR "Invalid file type: %s\n", path);
-			ret = -EINVAL;
-			goto out;
-		}
+	inode = filp->f_dentry->d_inode;
+	if (!S_ISREG(inode->i_mode)) {
+		printk(KERN_ERR "Invalid file type: %s\n", path);
+		ret = -EINVAL;
+		goto out;
 	}
 
 	buf = kmalloc(DOWNLOAD_CHUCK + pad_size, GFP_KERNEL);
@@ -365,7 +361,7 @@ static int em_download_image(struct usb_device *usbdev, char *path,
 		goto out;
 
 out:
-	filp_close(filp, current->files);
+	filp_close(filp, NULL);
 
 restore_fs:
 	set_fs(fs);