diff options
| author | Mark Brown | 2012-06-12 05:46:58 +0200 |
|---|---|---|
| committer | Mark Brown | 2012-06-12 05:46:58 +0200 |
| commit | 66e61060d7ad9fcf61475fb836fb5987db7a7ee0 (patch) | |
| tree | a0abe3fb2fa8858261dc41df9444c0e0ca85f1a6 /lib/btree.c | |
| parent | ASoC: wm8903: Move register default changes to I2C probe (diff) | |
| parent | mfd/ab8500: Move platform-data for ab8500-codec into mfd-driver (diff) | |
| download | kernel-qcow2-linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.tar.gz kernel-qcow2-linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.tar.xz kernel-qcow2-linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.zip | |
Merge branch 'asoc-ab8500' into for-3.6
Diffstat (limited to 'lib/btree.c')
| -rw-r--r-- | lib/btree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/btree.c b/lib/btree.c index e5ec1e9c1aa5..f9a484676cb6 100644 --- a/lib/btree.c +++ b/lib/btree.c @@ -319,8 +319,8 @@ void *btree_get_prev(struct btree_head *head, struct btree_geo *geo, if (head->height == 0) return NULL; -retry: longcpy(key, __key, geo->keylen); +retry: dec_key(geo, key); node = head->node; @@ -351,7 +351,7 @@ retry: } miss: if (retry_key) { - __key = retry_key; + longcpy(key, retry_key, geo->keylen); retry_key = NULL; goto retry; } @@ -509,6 +509,7 @@ retry: int btree_insert(struct btree_head *head, struct btree_geo *geo, unsigned long *key, void *val, gfp_t gfp) { + BUG_ON(!val); return btree_insert_level(head, geo, key, val, 1, gfp); } EXPORT_SYMBOL_GPL(btree_insert); |