diff --git a/[refs] b/[refs] index 9de86b94c1b7..fe16f8ef41fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dae92a718570e6a942e0b882e53d25cab03b40f +refs/heads/master: b0769891ba7baa53f270dc70d71934748beb4c5b diff --git a/trunk/drivers/edac/i5100_edac.c b/trunk/drivers/edac/i5100_edac.c index 6ed11b1881b7..1b635178cc44 100644 --- a/trunk/drivers/edac/i5100_edac.c +++ b/trunk/drivers/edac/i5100_edac.c @@ -961,14 +961,8 @@ static ssize_t inject_enable_write(struct file *file, const char __user *data, return count; } -static int inject_enable_open(struct inode *inode, struct file *file) -{ - file->private_data = inode->i_private; - return 0; -} - static const struct file_operations i5100_inject_enable_fops = { - .open = inject_enable_open, + .open = simple_open, .write = inject_enable_write, .llseek = generic_file_llseek, };