Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / drivers / scsi / ch.c

diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 27012908b58619c1ce50db175206e699852ca277..9088548698646029647dc07884528ad54d0655c4 100644 (file)
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -239,7 +239,7 @@ ch_read_element_status(scsi_changer *ch, u_int elem, char *data)
        u_char  *buffer;
        int     result;
 
-       buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
+       buffer = kmalloc(512, GFP_KERNEL);
        if(!buffer)
                return -ENOMEM;
 
@@ -297,7 +297,7 @@ ch_readconfig(scsi_changer *ch)
        int     result,id,lun,i;
        u_int   elem;
 
-       buffer = kzalloc(512, GFP_KERNEL | GFP_DMA);
+       buffer = kzalloc(512, GFP_KERNEL);
        if (!buffer)
                return -ENOMEM;
 
@@ -783,7 +783,7 @@ static long ch_ioctl(struct file *file,
                        return -EINVAL;
                elem = ch->firsts[cge.cge_type] + cge.cge_unit;
 
-               buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
+               buffer = kmalloc(512, GFP_KERNEL);
                if (!buffer)
                        return -ENOMEM;
                mutex_lock(&ch->lock);
@@ -877,7 +877,7 @@ static long ch_ioctl(struct file *file,
        }
 
        default:
-               return scsi_ioctl(ch->device, NULL, file->f_mode, cmd, argp);
+               return scsi_ioctl(ch->device, file->f_mode, cmd, argp);
 
        }
 }