Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mv-sheeva.git] / drivers / scsi / sg.c

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 5428d53f5a133992bef0114b785e2d54ebec1c0c..909ed9ed24c0fb25663ee09d5ac864628f220843 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -212,7 +212,7 @@ static void sg_put_dev(Sg_device *sdp);
 
 static int sg_allow_access(struct file *filp, unsigned char *cmd)
 {
-       struct sg_fd *sfp = (struct sg_fd *)filp->private_data;
+       struct sg_fd *sfp = filp->private_data;
 
        if (sfp->parentdp->device->type == TYPE_SCANNER)
                return 0;