lkml.org 
[lkml]   [2002]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH] 20/41 sound/oss/msnd_pinnacle.c - convert cli to spinlocks
From
--- vanilla-2.5.32/sound/oss/msnd_pinnacle.c	Sat Aug 10 00:04:15 2002
+++ linux-2.5-cli-oss/sound/oss/msnd_pinnacle.c Sat Aug 10 19:51:16 2002
@@ -645,7 +645,7 @@

static int dev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);

if (cmd == OSS_GETVERSION) {
int sound_version = SOUND_VERSION;
@@ -757,7 +757,7 @@

static int dev_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
int err = 0;

if (minor == dev.dsp_minor) {
@@ -792,7 +792,7 @@

static int dev_release(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
int err = 0;

lock_kernel();
@@ -982,7 +982,7 @@

static ssize_t dev_read(struct file *file, char *buf, size_t count, loff_t *off)
{
- int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ int minor = minor(file->f_dentry->d_inode->i_rdev);
if (minor == dev.dsp_minor)
return dsp_read(buf, count);
else
@@ -991,7 +991,7 @@

static ssize_t dev_write(struct file *file, const char *buf, size_t count, loff_t *off)
{
- int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ int minor = minor(file->f_dentry->d_inode->i_rdev);
if (minor == dev.dsp_minor)
return dsp_write(buf, count);
else
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:28    [W:0.019 / U:0.792 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site