← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to drivers/ieee1394/ieee1394_core.h

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-08-05 23:00:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090805230052-7xedvqcyk9dnnxb2
Tags: 2.6.31-1.1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/ieee1394/ieee1394_core.h
5
5
#include <linux/fs.h>
6
6
#include <linux/list.h>
7
7
#include <linux/types.h>
 
8
#include <linux/cdev.h>
8
9
#include <asm/atomic.h>
9
10
 
10
11
#include "hosts.h"
155
156
 */
156
157
static inline unsigned char ieee1394_file_to_instance(struct file *file)
157
158
{
158
 
        return file->f_path.dentry->d_inode->i_cindex;
 
159
        int idx = cdev_index(file->f_path.dentry->d_inode);
 
160
        if (idx < 0)
 
161
                idx = 0;
 
162
        return idx;
159
163
}
160
164
 
161
165
extern int hpsb_disable_irm;