3 files changed, 17 insertions, 2 deletions

diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c
index 0e941b57482e..6c4f4b5a9dd3 100644
--- a/drivers/char/generic_nvram.c
+++ b/drivers/char/generic_nvram.c
@@ -34,12 +34,16 @@ static ssize_t nvram_len;
 static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
 {
         switch (origin) {
+        case 0:
+                break;
         case 1:
                 offset += file->f_pos;
                 break;
         case 2:
                 offset += nvram_len;
                 break;
+        default:
+                offset = -1;
         }
         if (offset < 0)
                 return -EINVAL;
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 166f1e7aaa7e..da3cfee782dc 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -224,6 +224,8 @@ static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
         case 2:
                 offset += NVRAM_BYTES;
                 break;
+        default:
+                return -EINVAL;
         }
 
         return (offset >= 0) ? (file->f_pos = offset) : -EINVAL;
diff --git a/drivers/char/ps3flash.c b/drivers/char/ps3flash.c
index 85c004a518ee..d0c57c2e2909 100644
--- a/drivers/char/ps3flash.c
+++ b/drivers/char/ps3flash.c
@@ -101,12 +101,16 @@ static loff_t ps3flash_llseek(struct file *file, loff_t offset, int origin)
 
         mutex_lock(&file->f_mapping->host->i_mutex);
         switch (origin) {
+        case 0:
+                break;
         case 1:
                 offset += file->f_pos;
                 break;
         case 2:
                 offset += dev->regions[dev->region_idx].size*dev->blk_size;
                 break;
+        default:
+                offset = -1;
         }
         if (offset < 0) {
                 res = -EINVAL;
@@ -305,9 +309,14 @@ static int ps3flash_flush(struct file *file, fl_owner_t id)
         return ps3flash_writeback(ps3flash_dev);
 }
 
-static int ps3flash_fsync(struct file *file, int datasync)
+static int ps3flash_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 {
-        return ps3flash_writeback(ps3flash_dev);
+        struct inode *inode = file->f_path.dentry->d_inode;
+        int err;
+        mutex_lock(&inode->i_mutex);
+        err = ps3flash_writeback(ps3flash_dev);
+        mutex_unlock(&inode->i_mutex);
+        return err;
 }
 
 static irqreturn_t ps3flash_interrupt(int irq, void *data)