aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorWolfram Sang <wsa-dev@sang-engineering.com>2016-07-09 00:35:01 -0400
committerWolfram Sang <wsa@the-dreams.de>2016-07-14 09:07:29 -0400
commit84d0b61773c7af077be71f74f0d7fea65af7f9b0 (patch)
tree21561b6187544d23e7d31efdd9ea0e34eb743b1c /drivers/i2c
parent8ddfe4108e0a160f078adc96827e3809beb4d451 (diff)
i2c: add error message when obtaining idr fails
Fix some whitespace issues while here. Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/i2c-core.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 8e07e3be4880..1a91b5173104 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1684,13 +1684,12 @@ out_list:
1684 */ 1684 */
1685static int __i2c_add_numbered_adapter(struct i2c_adapter *adap) 1685static int __i2c_add_numbered_adapter(struct i2c_adapter *adap)
1686{ 1686{
1687 int id; 1687 int id;
1688 1688
1689 mutex_lock(&core_lock); 1689 mutex_lock(&core_lock);
1690 id = idr_alloc(&i2c_adapter_idr, adap, adap->nr, adap->nr + 1, 1690 id = idr_alloc(&i2c_adapter_idr, adap, adap->nr, adap->nr + 1, GFP_KERNEL);
1691 GFP_KERNEL);
1692 mutex_unlock(&core_lock); 1691 mutex_unlock(&core_lock);
1693 if (id < 0) 1692 if (WARN(id < 0, "couldn't get idr"))
1694 return id == -ENOSPC ? -EBUSY : id; 1693 return id == -ENOSPC ? -EBUSY : id;
1695 1694
1696 return i2c_register_adapter(adap); 1695 return i2c_register_adapter(adap);
@@ -1727,7 +1726,7 @@ int i2c_add_adapter(struct i2c_adapter *adapter)
1727 id = idr_alloc(&i2c_adapter_idr, adapter, 1726 id = idr_alloc(&i2c_adapter_idr, adapter,
1728 __i2c_first_dynamic_bus_num, 0, GFP_KERNEL); 1727 __i2c_first_dynamic_bus_num, 0, GFP_KERNEL);
1729 mutex_unlock(&core_lock); 1728 mutex_unlock(&core_lock);
1730 if (id < 0) 1729 if (WARN(id < 0, "couldn't get idr"))
1731 return id; 1730 return id;
1732 1731
1733 adapter->nr = id; 1732 adapter->nr = id;