resolved conflicts for merge of 5284bcff
to gingerbread-plus-aosp
Change-Id: I108a0c32efb5add1fec41bfe76f041971801d48d
This commit is contained in:
commit
137858b43b
1 changed files with 2 additions and 2 deletions
|
@ -202,8 +202,8 @@ void DirectVolume::handlePartitionAdded(const char *devpath, NetlinkEvent *evt)
|
|||
#ifdef PARTITION_DEBUG
|
||||
SLOGD("Dv:partAdd: part_num = %d, minor = %d\n", part_num, minor);
|
||||
#endif
|
||||
if (part_num > MAX_PARTITIONS) {
|
||||
SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS);
|
||||
if (part_num >= MAX_PARTITIONS) {
|
||||
SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS-1);
|
||||
} else {
|
||||
mPartMinors[part_num -1] = minor;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue