summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2004-04-08 12:22:22 +0000
committerDave Airlie <airlied@linux.ie>2004-04-08 12:22:22 +0000
commit9cff4b45e77c9259a4161ddb55564336f8b99361 (patch)
tree4133ad4f4df9fea02b91c0a15d17ded23b7ee8f4 /linux-core
parent3e0f3c1fbb9b10bcc8e037f79f25d5e491dcfd91 (diff)
2.6 patches for larger dev_t
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_drv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 06eaf3b9..35876dc6 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -790,7 +790,7 @@ int DRM(open)( struct inode *inode, struct file *filp )
int i;
for (i = 0; i < DRM(numdevs); i++) {
- if (minor(inode->i_rdev) == DRM(device)[i].minor) {
+ if (iminor(inode) == DRM(device)[i].minor) {
dev = &(DRM(device)[i]);
break;
}
@@ -843,7 +843,7 @@ int DRM(release)( struct inode *inode, struct file *filp )
*/
DRM_DEBUG( "pid = %d, device = 0x%lx, open_count = %d\n",
- current->pid, (long)dev->device, dev->open_count );
+ current->pid, (long)old_encode_dev(dev->device), dev->open_count );
if ( priv->lock_count && dev->lock.hw_lock &&
_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock) &&
@@ -998,7 +998,7 @@ int DRM(ioctl)( struct inode *inode, struct file *filp,
++priv->ioctl_count;
DRM_DEBUG( "pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
- current->pid, cmd, nr, (long)dev->device,
+ current->pid, cmd, nr, (long)old_encode_dev(dev->device),
priv->authenticated );
if ( nr >= DRIVER_IOCTL_COUNT ) {