Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205847
b: refs/heads/master
c: 3ff8101
h: refs/heads/master
i:
  205845: 3984f56
  205843: 0d45b67
  205839: ce47e17
v: v3
  • Loading branch information
Arnd Bergmann authored and Greg Kroah-Hartman committed Jul 8, 2010
1 parent 0954e17 commit dddd7ff
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: af6d2b2a3d43d25aa4e205c029ee737642cc4ec2
refs/heads/master: 3ff81013699000f2d55e78efadb03a6e2beddb7a
10 changes: 2 additions & 8 deletions trunk/drivers/staging/msm/mdp4_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,6 @@ DEFINE_SIMPLE_ATTRIBUTE(
"%llx\n");


static int mdp4_debugfs_open(struct inode *inode, struct file *file)
{
/* non-seekable */
file->f_mode &= ~(FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE);
return 0;
}

static int mdp4_debugfs_release(struct inode *inode, struct file *file)
{
return 0;
Expand Down Expand Up @@ -144,10 +137,11 @@ static ssize_t mdp4_debugfs_read(
}

static const struct file_operations mdp4_debugfs_fops = {
.open = mdp4_debugfs_open,
.open = nonseekable_open,
.release = mdp4_debugfs_release,
.read = mdp4_debugfs_read,
.write = mdp4_debugfs_write,
.llseek = no_llseek,
};

int mdp4_debugfs_init(void)
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/staging/panel/panel.c
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@ static int lcd_open(struct inode *inode, struct file *file)
lcd_must_clear = 0;
}
lcd_open_cnt++;
return 0;
return nonseekable_open(inode, file);
}

static int lcd_release(struct inode *inode, struct file *file)
Expand All @@ -1369,6 +1369,7 @@ static const struct file_operations lcd_fops = {
.write = lcd_write,
.open = lcd_open,
.release = lcd_release,
.llseek = no_llseek,
};

static struct miscdevice lcd_dev = {
Expand Down

0 comments on commit dddd7ff

Please sign in to comment.