git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
scsi
/
libata-scsi.c
diff --git
a/drivers/scsi/libata-scsi.c
b/drivers/scsi/libata-scsi.c
index
93d18a7
..
2915bca
100644
(file)
--- a/
drivers/scsi/libata-scsi.c
+++ b/
drivers/scsi/libata-scsi.c
@@
-222,9
+222,7
@@
int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
&& copy_to_user(arg + sizeof(args), argbuf, argsize))
rc = -EFAULT;
error:
- if (argbuf)
- kfree(argbuf);
-
+ kfree(argbuf);
return rc;
}