diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 10:20:37 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 10:20:37 -0800 |
| commit | 1206e872ce74aab253c39c3547bfaadc5e1f6011 (patch) | |
| tree | a98aed4569df620e437e4920d246241d3531dac0 /DirectVolume.cpp | |
| parent | 92c243afae15567f166d0059db5aff13b8849596 (diff) | |
| parent | 09f774b7d3ad4e4205485b6997d44f7edd084598 (diff) | |
| download | system_vold-1206e872ce74aab253c39c3547bfaadc5e1f6011.tar.gz system_vold-1206e872ce74aab253c39c3547bfaadc5e1f6011.tar.bz2 system_vold-1206e872ce74aab253c39c3547bfaadc5e1f6011.zip | |
resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp
Change-Id: I103db47198ad09783aa6539cde271df0fdb9c594
Diffstat (limited to 'DirectVolume.cpp')
| -rw-r--r-- | DirectVolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DirectVolume.cpp b/DirectVolume.cpp index 0960724..3191cc7 100644 --- a/DirectVolume.cpp +++ b/DirectVolume.cpp @@ -197,8 +197,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-1); + if (part_num > MAX_PARTITIONS) { + SLOGE("Dv:partAdd: ignoring part_num = %d (max: %d)\n", part_num, MAX_PARTITIONS); } else { mPartMinors[part_num -1] = minor; } |