summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/cpqfcTSinit.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 14:12:20 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 14:12:20 +0200
commit165415f700b0c77fa1f8db6198f48582639adf78 (patch)
tree088e305b0b5b0c6753072e13be1177824c3ed59d /drivers/scsi/cpqfcTSinit.c
parentMerge /spare/repo/linux-2.6/ (diff)
parentLinux 2.6.14-rc1 (diff)
downloadlinux-165415f700b0c77fa1f8db6198f48582639adf78.tar.xz
linux-165415f700b0c77fa1f8db6198f48582639adf78.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/cpqfcTSinit.c')
-rw-r--r--drivers/scsi/cpqfcTSinit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/cpqfcTSinit.c b/drivers/scsi/cpqfcTSinit.c
index d72be0ce89c8..3fda8d455c5b 100644
--- a/drivers/scsi/cpqfcTSinit.c
+++ b/drivers/scsi/cpqfcTSinit.c
@@ -691,8 +691,7 @@ int cpqfcTS_ioctl( struct scsi_device *ScsiDev, int Cmnd, void *arg)
if( copy_to_user( vendor_cmd->bufp, buf, vendor_cmd->len))
result = -EFAULT;
- if( buf)
- kfree( buf);
+ kfree(buf);
return result;
}