diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 13:50:41 +0200 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 13:50:41 +0200 |
| commit | 7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5 (patch) | |
| tree | 3916e6cf9678a41081ae822ef67ec5cae1c1fffa /lib/idr.c | |
| parent | 3fcf2b2a2529e268c537d8ad9dac5987ebc8a2f7 (diff) | |
| parent | 0224d45c9d46401b6d7018a96cfe049c5da7d91c (diff) | |
| download | talos-op-linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.tar.gz talos-op-linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.zip | |
Merge branch 'i2c/cht-wc-fusb302-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c/cht-wc-fusb302-immutable immutable branch from Wolfram Sang:
as discussed before, here is the immutable branch for the i2c-cht-wc
driver, so you can safely apply Hans' patch [1]
"platform/x86: intel_cht_int33fe: Update fusb302 type string, add properties"
on top of this.
[1] http://patchwork.ozlabs.org/patch/824314/
Diffstat (limited to 'lib/idr.c')
| -rw-r--r-- | lib/idr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/idr.c b/lib/idr.c index f9adf4805fd7..edd9b2be1651 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -146,8 +146,8 @@ EXPORT_SYMBOL(idr_get_next_ext); * idr_alloc() and idr_remove() (as long as the ID being removed is not * the one being replaced!). * - * Returns: 0 on success. %-ENOENT indicates that @id was not found. - * %-EINVAL indicates that @id or @ptr were not valid. + * Returns: the old value on success. %-ENOENT indicates that @id was not + * found. %-EINVAL indicates that @id or @ptr were not valid. */ void *idr_replace(struct idr *idr, void *ptr, int id) { |
