diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /drivers/gpu/drm/drm_fops.c | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'drivers/gpu/drm/drm_fops.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fops.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 6c020fe5431c..f52663ebe016 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
| @@ -484,6 +484,7 @@ int drm_release(struct inode *inode, struct file *filp) | |||
| 484 | mutex_lock(&dev->struct_mutex); | 484 | mutex_lock(&dev->struct_mutex); |
| 485 | 485 | ||
| 486 | if (file_priv->is_master) { | 486 | if (file_priv->is_master) { |
| 487 | struct drm_master *master = file_priv->master; | ||
| 487 | struct drm_file *temp; | 488 | struct drm_file *temp; |
| 488 | list_for_each_entry(temp, &dev->filelist, lhead) { | 489 | list_for_each_entry(temp, &dev->filelist, lhead) { |
| 489 | if ((temp->master == file_priv->master) && | 490 | if ((temp->master == file_priv->master) && |
| @@ -491,6 +492,19 @@ int drm_release(struct inode *inode, struct file *filp) | |||
| 491 | temp->authenticated = 0; | 492 | temp->authenticated = 0; |
| 492 | } | 493 | } |
| 493 | 494 | ||
| 495 | /** | ||
| 496 | * Since the master is disappearing, so is the | ||
| 497 | * possibility to lock. | ||
| 498 | */ | ||
| 499 | |||
| 500 | if (master->lock.hw_lock) { | ||
| 501 | if (dev->sigdata.lock == master->lock.hw_lock) | ||
| 502 | dev->sigdata.lock = NULL; | ||
| 503 | master->lock.hw_lock = NULL; | ||
| 504 | master->lock.file_priv = NULL; | ||
| 505 | wake_up_interruptible_all(&master->lock.lock_queue); | ||
| 506 | } | ||
| 507 | |||
| 494 | if (file_priv->minor->master == file_priv->master) { | 508 | if (file_priv->minor->master == file_priv->master) { |
| 495 | /* drop the reference held my the minor */ | 509 | /* drop the reference held my the minor */ |
| 496 | drm_master_put(&file_priv->minor->master); | 510 | drm_master_put(&file_priv->minor->master); |