linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / block / acsi_slm.c

diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 4030a8f..a5c1c8e 100644 (file)
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -65,6 +65,7 @@ not be guaranteed. There are several ways to assure this:
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/devfs_fs_kernel.h>
 #include <linux/smp_lock.h>
 
 #include <asm/pgtable.h>
@@ -368,6 +369,8 @@ static ssize_t slm_read( struct file *file, char *buf, size_t count,
        int length;
        int end;
 
+       if (count < 0)
+               return( -EINVAL );
        if (!(page = __get_free_page( GFP_KERNEL )))
                return( -ENOMEM );
        
@@ -1004,6 +1007,11 @@ int slm_init( void )
        BufferP = SLMBuffer;
        SLMState = IDLE;
        
+       devfs_mk_dir("slm");
+       for (i = 0; i < MAX_SLM; i++) {
+               devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
+                               S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
+       }
        return 0;
 }
 
@@ -1026,6 +1034,10 @@ int init_module(void)
 
 void cleanup_module(void)
 {
+       int i;
+       for (i = 0; i < MAX_SLM; i++)
+               devfs_remove("slm/%d", i);
+       devfs_remove("slm");
        if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0)
                printk( KERN_ERR "acsi_slm: cleanup_module failed\n");
        atari_stram_free( SLMBuffer );