diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 09:56:43 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-15 09:56:43 -0500 |
| commit | 326b06a8a9b09d6d9a276fd550b6b6bb138e9a47 (patch) | |
| tree | b9bdcb0bd635b91258cec09c981af2c5dcc0f683 /lib | |
| parent | 92b2e81d6f95bcee386abac4c4389f5b950f7bb9 (diff) | |
| parent | 9bffb1fb7c22c96d51d4ba06e2e023dd568a5872 (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/asn1_decoder.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile index 821a16229111..a08b791200f3 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -163,7 +163,7 @@ $(obj)/crc32table.h: $(obj)/gen_crc32table | |||
| 163 | # | 163 | # |
| 164 | obj-$(CONFIG_OID_REGISTRY) += oid_registry.o | 164 | obj-$(CONFIG_OID_REGISTRY) += oid_registry.o |
| 165 | 165 | ||
| 166 | $(obj)/oid_registry.c: $(obj)/oid_registry_data.c | 166 | $(obj)/oid_registry.o: $(obj)/oid_registry_data.c |
| 167 | 167 | ||
| 168 | $(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \ | 168 | $(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \ |
| 169 | $(src)/build_OID_registry | 169 | $(src)/build_OID_registry |
diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c index de2c8b5a715b..5293d2433029 100644 --- a/lib/asn1_decoder.c +++ b/lib/asn1_decoder.c | |||
| @@ -91,7 +91,7 @@ next_tag: | |||
| 91 | 91 | ||
| 92 | /* Extract the length */ | 92 | /* Extract the length */ |
| 93 | len = data[dp++]; | 93 | len = data[dp++]; |
| 94 | if (len < 0x7f) { | 94 | if (len <= 0x7f) { |
| 95 | dp += len; | 95 | dp += len; |
| 96 | goto next_tag; | 96 | goto next_tag; |
| 97 | } | 97 | } |