From eb0a70c82ac9d8246dbde03e0c941fb3700da92b Mon Sep 17 00:00:00 2001 From: Josef Sipek Date: Fri, 8 Dec 2006 02:36:57 -0800 Subject: [PATCH] --- yaml --- r: 43558 b: refs/heads/master c: f04538c38134edf5f424dc24fda6ef46da736734 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/cosa.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 69e3b34aa7b2..8633ce86156e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4176d326d76ddea457a5e42ac8c2e3aed3430b1 +refs/heads/master: f04538c38134edf5f424dc24fda6ef46da736734 diff --git a/trunk/drivers/net/wan/cosa.c b/trunk/drivers/net/wan/cosa.c index e1bf8b93f958..6c7dfb50143f 100644 --- a/trunk/drivers/net/wan/cosa.c +++ b/trunk/drivers/net/wan/cosa.c @@ -974,12 +974,12 @@ static int cosa_open(struct inode *inode, struct file *file) unsigned long flags; int n; - if ((n=iminor(file->f_dentry->d_inode)>>CARD_MINOR_BITS) + if ((n=iminor(file->f_path.dentry->d_inode)>>CARD_MINOR_BITS) >= nr_cards) return -ENODEV; cosa = cosa_cards+n; - if ((n=iminor(file->f_dentry->d_inode) + if ((n=iminor(file->f_path.dentry->d_inode) & ((1<= cosa->nchannels) return -ENODEV; chan = cosa->chan + n;