diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-09-05 10:54:59 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-09-05 10:54:59 +0000 |
| commit | eeae6a0a3885f9af9efba7c1e1bcb1e633635717 (patch) | |
| tree | ca92f0395e3745cb78c752c93968d175ca0b5e38 /linux-core/drm_fops.c | |
| parent | f96e00595dff85e18697205686f568042e0b083b (diff) | |
merge back bunch of whitespace and misc changes from kernel
Diffstat (limited to 'linux-core/drm_fops.c')
| -rw-r--r-- | linux-core/drm_fops.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 21935b7a..0e91190a 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -73,11 +73,10 @@ int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev) priv->authenticated = capable(CAP_SYS_ADMIN); priv->lock_count = 0; - if (dev->fn_tbl.open_helper) - { - ret=dev->fn_tbl.open_helper(dev, priv); - if (ret < 0) - goto out_free; + if (dev->fn_tbl.open_helper) { + ret=dev->fn_tbl.open_helper(dev, priv); + if (ret < 0) + goto out_free; } down(&dev->struct_sem); @@ -110,8 +109,9 @@ int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev) #endif return 0; - out_free: +out_free: DRM(free)(priv, sizeof(*priv), DRM_MEM_FILES); + filp->private_data=NULL; return ret; } |