nfsd4: reshuffle lease-setting code to allow reuse

[safe/jmp/linux-2.6] / drivers / char / dsp56k.c

diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 19b8850..85832ab 100644 (file)
--- a/drivers/char/dsp56k.c
+++ b/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)
@@ -508,8 +508,8 @@ static int __init dsp56k_init_driver(void)
                err = PTR_ERR(dsp56k_class);
                goto out_chrdev;
        }
-       device_create_drvdata(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0),
-                             NULL, "dsp56k");
+       device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL,
+                     "dsp56k");
 
        printk(banner);
        goto out;