From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753994AbdCHSnk (ORCPT ); Wed, 8 Mar 2017 13:43:40 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:32854 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbdCHSnj (ORCPT ); Wed, 8 Mar 2017 13:43:39 -0500 From: Dmitry Torokhov To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] i2c: do not leave semaphore armed when copying properties fails Date: Wed, 8 Mar 2017 10:41:01 -0800 Message-Id: <20170308184102.29334-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We should not leave i2c_register_board_info() early, without unlocking the __i2c_board_lock. Fixes: b0c1e95ab44f ("i2c: copy device properties when using ...") Signed-off-by: Dmitry Torokhov --- drivers/i2c/i2c-boardinfo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c index 5b8f6c3a6950..0e285c68b2ff 100644 --- a/drivers/i2c/i2c-boardinfo.c +++ b/drivers/i2c/i2c-boardinfo.c @@ -84,8 +84,10 @@ int i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsig if (info->properties) { devinfo->board_info.properties = property_entries_dup(info->properties); - if (IS_ERR(devinfo->board_info.properties)) - return PTR_ERR(devinfo->board_info.properties); + if (IS_ERR(devinfo->board_info.properties)) { + status = PTR_ERR(devinfo->board_info.properties); + break; + } } list_add_tail(&devinfo->list, &__i2c_board_list); -- 2.12.0.246.ga2ecc84866-goog