diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 16:49:20 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 16:49:41 -0800 |
| commit | 4bc33a2cd5070188c79029a8a9f2058dfd2a79a8 (patch) | |
| tree | 77047bf8d381df29334d125f825940161e26746c | |
| parent | 1b6f47537c86494bb525c31e695ae3a1dfd953ca (diff) | |
| download | op-kernel-dev-4bc33a2cd5070188c79029a8a9f2058dfd2a79a8.zip op-kernel-dev-4bc33a2cd5070188c79029a8a9f2058dfd2a79a8.tar.gz | |
Revert "fbdev: pxa3xx-gcu: remove redundant implementation of open()"
This reverts commit 2bfeeca107591134bf9a40945c50d337bf858612.
Not needed after the next patch is applied.
Cc: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/video/fbdev/pxa3xx-gcu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c index 7678a94..4df3657 100644 --- a/drivers/video/fbdev/pxa3xx-gcu.c +++ b/drivers/video/fbdev/pxa3xx-gcu.c @@ -373,6 +373,15 @@ static inline struct pxa3xx_gcu_priv *to_pxa3xx_gcu_priv(struct file *file) return container_of(dev, struct pxa3xx_gcu_priv, misc_dev); } +/* + * provide an empty .open callback, so the core sets file->private_data + * for us. + */ +static int pxa3xx_gcu_open(struct inode *inode, struct file *file) +{ + return 0; +} + static ssize_t pxa3xx_gcu_write(struct file *file, const char *buff, size_t count, loff_t *offp) @@ -571,6 +580,7 @@ pxa3xx_gcu_free_buffers(struct device *dev, static const struct file_operations pxa3xx_gcu_miscdev_fops = { .owner = THIS_MODULE, + .open = pxa3xx_gcu_open, .write = pxa3xx_gcu_write, .unlocked_ioctl = pxa3xx_gcu_ioctl, .mmap = pxa3xx_gcu_mmap, |
