[PATCH 1/2] drm: restore open_count if drm_setup fails

[Thomas Hellstrom]

Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com>

On 10/29/2012 06:35 PM, Ilija Hadzic wrote:
> If drm_setup (called at first open) fails, the whole
> open call has failed, so we should not keep the
> open_count incremented.
>
> Signed-off-by: Ilija Hadzic <ihadzic at research.bell-labs.com>
> Cc: stable at vger.kernel.org
> ---
>   drivers/gpu/drm/drm_fops.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
> index 7ef1b67..af68eca 100644
> --- a/drivers/gpu/drm/drm_fops.c
> +++ b/drivers/gpu/drm/drm_fops.c
> @@ -135,8 +135,11 @@ int drm_open(struct inode *inode, struct file *filp)
>   	retcode = drm_open_helper(inode, filp, dev);
>   	if (!retcode) {
>   		atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
> -		if (!dev->open_count++)
> +		if (!dev->open_count++) {
>   			retcode = drm_setup(dev);
> +			if (retcode)
> +				dev->open_count--;
> +		}
>   	}
>   	if (!retcode) {
>   		mutex_lock(&dev->struct_mutex);