From 40d997238b56f7d19a4e2a45c681a57a74d29706 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Wed, 13 Jan 2010 15:32:21 +0100 Subject: [PATCH] --- yaml --- r: 185342 b: refs/heads/master c: f9de332ebf9df71892d52f7eb64af101a647349f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/devices.c | 4 ++-- trunk/drivers/usb/core/devio.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 829d0eb0938d..a2236f489b93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 063e20eb980f281d8456c3b48f146107f5cb2338 +refs/heads/master: f9de332ebf9df71892d52f7eb64af101a647349f diff --git a/trunk/drivers/usb/core/devices.c b/trunk/drivers/usb/core/devices.c index 175529fd02f3..c83c975152a6 100644 --- a/trunk/drivers/usb/core/devices.c +++ b/trunk/drivers/usb/core/devices.c @@ -675,7 +675,7 @@ static loff_t usb_device_lseek(struct file *file, loff_t offset, int orig) { loff_t ret; - lock_kernel(); + mutex_lock(&file->f_dentry->d_inode->i_mutex); switch (orig) { case 0: @@ -691,7 +691,7 @@ static loff_t usb_device_lseek(struct file *file, loff_t offset, int orig) ret = -EINVAL; } - unlock_kernel(); + mutex_unlock(&file->f_dentry->d_inode->i_mutex); return ret; } diff --git a/trunk/drivers/usb/core/devio.c b/trunk/drivers/usb/core/devio.c index 6e731507c0c4..300f65f681a3 100644 --- a/trunk/drivers/usb/core/devio.c +++ b/trunk/drivers/usb/core/devio.c @@ -122,7 +122,7 @@ static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig) { loff_t ret; - lock_kernel(); + mutex_lock(&file->f_dentry->d_inode->i_mutex); switch (orig) { case 0: @@ -138,7 +138,7 @@ static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig) ret = -EINVAL; } - unlock_kernel(); + mutex_unlock(&file->f_dentry->d_inode->i_mutex); return ret; }