> Fix deadlock in drm_setmaster_ioctl Wow, I have this right in my rawhide tree, I must have retyped this when I ported it back.
thanks I'll send it to Linus now. Dave. > > diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c > index 096e2a3..7c8b15b 100644 > --- a/drivers/gpu/drm/drm_stub.c > +++ b/drivers/gpu/drm/drm_stub.c > @@ -168,7 +168,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void > *data, > file_priv->minor->master != file_priv->master) { > mutex_lock(&dev->struct_mutex); > file_priv->minor->master = drm_master_get(file_priv->master); > - mutex_lock(&dev->struct_mutex); > + mutex_unlock(&dev->struct_mutex); > } > > return 0; > > ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel