---

yaml --- r: 106273 b: refs/heads/master c: 689796a h: refs/heads/master i: 106271: fe2fab7 v: v3
git-mirror · Jul 26, 2008 · 681c9ce · 681c9ce
1 parent 429ae47
commit 681c9ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37e67b75804b84e092ae9f1d7a19dc3522ef78ab
+refs/heads/master: 689796a141cea79d745a4689c65dd01c39e5e100
diff --git a/trunk/drivers/char/dsp56k.c b/trunk/drivers/char/dsp56k.c
@@ -304,9 +304,9 @@ static ssize_t dsp56k_write(struct file *file, const char __user *buf, size_t co
 }
 
 static long dsp56k_ioctl(struct file *file, unsigned int cmd,
-							unsigned long arg)
+			 unsigned long arg)
 {
-	int dev = iminor(inode) & 0x0f;
+	int dev = iminor(file->f_path.dentry->d_inode) & 0x0f;
 	void __user *argp = (void __user *)arg;
 
 	switch(dev)