projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-fix-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[cascardo/linux.git]
/
block
/
partitions
/
aix.c
diff --git
a/block/partitions/aix.c
b/block/partitions/aix.c
index
43be471
..
f3ed7b2
100644
(file)
--- a/
block/partitions/aix.c
+++ b/
block/partitions/aix.c
@@
-215,7
+215,7
@@
int aix_partition(struct parsed_partitions *state)
numlvs = be16_to_cpu(p->numlvs);
put_dev_sector(sect);
}
numlvs = be16_to_cpu(p->numlvs);
put_dev_sector(sect);
}
- lvip = k
zalloc(sizeof(struct lv_info) * state->limit
, GFP_KERNEL);
+ lvip = k
calloc(state->limit, sizeof(struct lv_info)
, GFP_KERNEL);
if (!lvip)
return 0;
if (numlvs && (d = read_part_sector(state, vgda_sector + 1, §))) {
if (!lvip)
return 0;
if (numlvs && (d = read_part_sector(state, vgda_sector + 1, §))) {
@@
-253,7
+253,7
@@
int aix_partition(struct parsed_partitions *state)
continue;
}
lv_ix = be16_to_cpu(p->lv_ix) - 1;
continue;
}
lv_ix = be16_to_cpu(p->lv_ix) - 1;
- if (lv_ix > state->limit) {
+ if (lv_ix >
=
state->limit) {
cur_lv_ix = -1;
continue;
}
cur_lv_ix = -1;
continue;
}