From: Josef Sipek Date: Fri, 8 Dec 2006 10:36:57 +0000 (-0800) Subject: [PATCH] struct path: convert cosa X-Git-Tag: v2.6.20-rc1~34^2~331 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f04538c38134edf5f424dc24fda6ef46da736734;p=linux-2.6-omap-h63xx.git [PATCH] struct path: convert cosa Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index e1bf8b93f95..6c7dfb50143 100644 --- a/drivers/net/wan/cosa.c +++ b/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;