1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index c8a8af0fe471..d9ff283f725e 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -66,8 +66,8 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
         inode->i_private = data;
         if ((mode & S_IFMT) == S_IFDIR) {
                 inode->i_op = &simple_dir_inode_operations;
-                inode->i_nlink++;
-                dir->i_nlink++;
+                inc_nlink(inode);
+                inc_nlink(dir);
         }
 
         inode->i_fop = fops;
@@ -356,19 +356,16 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
 
         pos = *ppos;
 
-        if ( pos < 0) {
+        if (pos != 0) {
                 ret = -EINVAL;
                 goto bail;
         }
 
-        if (pos >= sizeof(struct ipath_flash)) {
-                ret = 0;
+        if (count != sizeof(struct ipath_flash)) {
+                ret = -EINVAL;
                 goto bail;
         }
 
-        if (count > sizeof(struct ipath_flash) - pos)
-                count = sizeof(struct ipath_flash) - pos;
-
         tmp = kmalloc(count, GFP_KERNEL);
         if (!tmp) {
                 ret = -ENOMEM;