projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
ide
/
ide-ioctls.c
diff --git
a/drivers/ide/ide-ioctls.c
b/drivers/ide/ide-ioctls.c
index 82f252c3ee6e500eb85fc466f1fc26e5c71b6d5a..e246d3d3fbcc5c280ff520b090c297eb42c05a1e 100644
(file)
--- a/
drivers/ide/ide-ioctls.c
+++ b/
drivers/ide/ide-ioctls.c
@@
-64,7
+64,8
@@
static int ide_get_identity_ioctl(ide_drive_t *drive, unsigned int cmd,
goto out;
}
- id = kmalloc(size, GFP_KERNEL);
+ /* ata_id_to_hd_driveid() relies on 'id' to be fully allocated. */
+ id = kmalloc(ATA_ID_WORDS * 2, GFP_KERNEL);
if (id == NULL) {
rc = -ENOMEM;
goto out;