1 files changed, 4 insertions, 2 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 4d11f9d84666..39aa9d129612 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -428,14 +428,16 @@ int swap_type_of(dev_t device)
 {
         int i;
 
-        if (!device)
-                return -EINVAL;
         spin_lock(&swap_lock);
         for (i = 0; i < nr_swapfiles; i++) {
                 struct inode *inode;
 
                 if (!(swap_info[i].flags & SWP_WRITEOK))
                         continue;
+                if (!device) {
+                        spin_unlock(&swap_lock);
+                        return i;
+                }
                 inode = swap_info->swap_file->f_dentry->d_inode;
                 if (S_ISBLK(inode->i_mode) &&
                     device == MKDEV(imajor(inode), iminor(inode))) {