From patchwork Mon Apr 9 14:57:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Baptiste Maneyrol X-Patchwork-Id: 10331633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6CA376022E for ; Mon, 9 Apr 2018 14:57:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CE5D28A63 for ; Mon, 9 Apr 2018 14:57:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5182728A6D; Mon, 9 Apr 2018 14:57:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A098728A63 for ; Mon, 9 Apr 2018 14:57:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752832AbeDIO5X (ORCPT ); Mon, 9 Apr 2018 10:57:23 -0400 Received: from mail-by2nam01on0062.outbound.protection.outlook.com ([104.47.34.62]:28384 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752830AbeDIO5S (ORCPT ); Mon, 9 Apr 2018 10:57:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=invensense.onmicrosoft.com; s=selector1-invensense-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=WIIVjVkf2wey3Nj1M26y4lIS0nJM0mWdUC9B4THpDD8=; b=SwjiuXwugYBPv+Y0ptyn6jyIOYwcz2zTxM6q+3Vkp4vhMGnJ9EhiFaBqi4KZdKeLRGSyH8nUDcrA8bav7aVok2gVCA+ALkaEq09vmdgEaZ3DSjxpVEq/ASt9tW1ON3FG1l3eHwuHVM6xy+uWqEWC25VqNOE9R7ycOAsLN/2pDlw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=JManeyrol@invensense.com; Received: from [IPv6:2a01:e35:87fd:c140:b95b:f2c8:d4dc:e485] (2a01:e35:87fd:c140:b95b:f2c8:d4dc:e485) by BN6PR1201MB0178.namprd12.prod.outlook.com (2603:10b6:405:56::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.653.12; Mon, 9 Apr 2018 14:57:15 +0000 To: linux-iio From: Jean-Baptiste Maneyrol Subject: [PATCH v2 1/4] iio: imu: inv_mpu6050: fix error path not turning chip back off Message-ID: <832c7d77-898b-bf25-bc20-12a79a598b12@invensense.com> Date: Mon, 9 Apr 2018 16:57:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: fr-classic X-Originating-IP: [2a01:e35:87fd:c140:b95b:f2c8:d4dc:e485] X-ClientProxiedBy: VI1PR08CA0175.eurprd08.prod.outlook.com (2603:10a6:800:d1::29) To BN6PR1201MB0178.namprd12.prod.outlook.com (2603:10b6:405:56::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bcaf41e3-cb67-4981-fef0-08d59e2a2f2a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN6PR1201MB0178; X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0178; 3:NcO58/PCVMh+LRcDT0pw6gktb8bCaEyOAng6AVQnGWh8Br5nk2pr+G4uMiDUa4IhRpJm54JDWPGMRAoMWOFHjg7vrOMcGw4CdWDeHOtKeWoszL7zAhOcVnphcZTRXybNU9eP62n5srCBQgE0Y3GtbiKPtSixjsWc1GB3cyZ/7UBHDAwv0zGq5ogWC8p3J6uXly5BWplz105K3sg36iBIMK8cef9z/x5OiJuxm/nLozEfC+qzsyDA2M2uYWiLNxIx; 25:E+M5nCg6YyVsItS7h7YLJC20IkbbQWJaNNKQsEPHeQPzyFsBiayjYyKZ7YqX1t+A4gRvGUhm7cawo69yqi1WY5PM3S/+eoZH3yQedaAwpgsl7/oqF5tyvYMkAnP1gAHSFInaT7q9YgP5bWne6aFU/YdJ8GRV3P7TDOQ1HoWfjF/Dx4242jkd7QvacExWHzLgltkkHCBG5kqOeTuOyiR3E3vqq2f0xprIIqBlhZLcgCRKdhrU5dSTpGyqd1t0NgLKOzGtIovbzcK44e4iWJK1B8bORga4O59m4gixfE1wZSQrlsnzayntJHr3guEZCpqS8y2rKGGqRQ7YSIFmqaba3g==; 31:mEuBopHO1fO6aBQHZEQ9agg4d63GZCL1tzQ++26xKfz6t+edM0ZhkXt+N5r9FvidYqpaYyVt5ZBFIN+gdKcVY1FKgpi1OnjjLqi532X2xlHggYFDsX/sNT4+v35HruHJ5vUHegmMXtWHxUNIxDTo2SKN1yqE0oZilqpxqmv7OZ3WQrf+Zza5BxA0szy23YZ7t+WKc5P2Ih9ceLaILXIGi7SixpMJOrNL6Uzbz0dGHIY= X-MS-TrafficTypeDiagnostic: BN6PR1201MB0178: X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0178; 20:me+OaQ/WLO+JjqgHPgSo6EiNqSwpypKpSgTC6qjxZVpm6bah/eJ71+AtmKT7HqKLMrpo6SZ4u0YR1jx6iH4oG7rXCT1BXzQ072e6eBJGvhBQI+McVGNpFjZUX6mn6aS8oZlbqFlYCoTYC1bR1EVruHS20VZLUEDH0jhXNXaTVASWa9qabyrjM4SSAWL3/St04vKgCSGhm2nW+umwpgXSRWP9JkhWlZhw26P+cHARuoe9x6nM9U38R6Oop2gkkdw0QZ464+laH0LC+D2fJy7nZ7PAKuL6BR36Re8GiKur/AcmI/cB8sCxC40cypFyinLH8lEOIx2RTnz/OnrRGPJzhQQ2aUsAtwqxvu27H3nybimHJSsc5NFR9yE6wiAgTV9gXejvaEIuRs9ZjKwO0XDdIop9ae0JUaVwB8OwKwth6WtJ65bHGDJliOz2VykkvzRsTRJSGa6JsXFOenes6iF5cURLzjWOeQMuruyszivSsBhbQksmeI0EP20nrKJttRCI; 4:jC5FLKJqZS6mOZN8L2L4qYfskj2bqdKsu0IJC2GWdycCsDXDiK4h/Hm+avUSBMMlEA5RXTshovndtZnQTWT1bCdAZD/K1IyWNmjDzP3NKZM1e+JuQnQvkEJg9NbSDUUXWB+a6mwxj3Sp/qqJvGSShVQiSK91pZYFp5m/GaGmbZkOtFn0UT6V4uMBNlUuppsRMe75IKPGXcVbLbHgsQFFX8C/nLGHL0lsCyhIQ+FeuPNwneR8bKeIUm+p4JCFm/fgvGegQgXxPD2Arsyujq3gFq8/iSfkklmk74ZOB4YZRA0VZTpunse6QHTDzh7nEUbB X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(257004950022427); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6041310)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:BN6PR1201MB0178; BCL:0; PCL:0; RULEID:; SRVR:BN6PR1201MB0178; X-Forefront-PRVS: 0637FCE711 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39850400004)(376002)(366004)(396003)(39380400002)(189003)(199004)(6916009)(476003)(5660300001)(106356001)(36756003)(386003)(7736002)(8676002)(72206003)(25786009)(8936002)(46003)(6486002)(2906002)(86362001)(105586002)(50466002)(305945005)(31696002)(1706002)(52146003)(52396003)(67846002)(23676004)(80792005)(6116002)(2486003)(52116002)(65806001)(65826007)(478600001)(81156014)(16526019)(2616005)(316002)(81166006)(58126008)(230700001)(65956001)(53936002)(186003)(6666003)(68736007)(31686004)(47776003)(64126003)(486006)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR1201MB0178; H:[IPv6:2a01:e35:87fd:c140:b95b:f2c8:d4dc:e485]; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: invensense.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyMDFNQjAxNzg7MjM6TlIzV1lLOVVLMko5NWtlM3VCRlJzbFJL?= =?utf-8?B?dnN0N0RTeVJVMFJ2TGJ0SDRJQ2xDbVRDTlk5NFMwSzVMN053RkUxdkF5TDlo?= =?utf-8?B?MklHT1hiRS9lSjdlNlo3TUdkOTJ6MzRoZW9tTG83OEV2MlM3Q2JWVnE5cURt?= =?utf-8?B?RnZxd29PQWVYYlBoR2tTSVFhN0g3QncrTDgwQ21kRytKR0EzTTlTWVg5djZJ?= =?utf-8?B?Z2kzZUkrVkdRTHE4eFNra2E5US9NaWhhZzB2NEVCVlNhNEM0SkNaZG9ZbXh3?= =?utf-8?B?RmswK2ZQQTNWNU5rZ0VzZXNmRWUxNUxwTDdkUi9UaFd4eUc5NG1obGsrdWty?= =?utf-8?B?MTZybVYvU3ZCaVJ2Z1pPMjExMEUyMVEyVnZoc3QvWEU1MnZpYTU1ckU0ZWox?= =?utf-8?B?SFIvVTQ1Z21rN3Z1SzBFMjFzYURXb2VSbnY1UkJMSUhpN0crYkxkR2FRcWV0?= =?utf-8?B?ZzJsZGt5SkxleTA0OWhPY1NZUDlwdmhYNEZhWnR4VnRqTDRrY2NPb2x1aHNm?= =?utf-8?B?TVJBRnlhVE45YkxNWHBXa0ZjM0xrNmJzVlEvQTJqVGNSZHVDYU1TNWJvRWty?= =?utf-8?B?OFMzT2tCczVWc2tIQUY1L2o5WXZ2ZzI5aDhtQmtGa3pOSExjOHBtZURzS05V?= =?utf-8?B?cXJRMWU0YnV5U2tPVXpUV2FESTIrODNQNXdFdTR5S0xocXJDakZVcGxiUVA3?= =?utf-8?B?UVdaQnpDQXFLNUdDRytmYTkrZWR3RXdlWDV2eE1ES1pyYjlabEY0N29tNGNO?= =?utf-8?B?ZGdUQU53d2NSeHhSWG16dVBBVTJEdTlndXhjZ3pzYUNRZ0d1dHM1Njl3UW95?= =?utf-8?B?NnpMMVRHWFBlRmtnd1BnbTZBNUp6aUlIWDJTci9vMUswVkpsSFRMZFlOSTBp?= =?utf-8?B?bms0S1NqWEI3RTZvSFdaRnZjTTl5WG9OVG95OG9HYXZJbFkxcW9VNkdQc2xF?= =?utf-8?B?VFpwQkMvQjBZbllMYmFBcGFVV2xpR0VQOFNVSitEWG9PWE14R3JCSmdPS3Rr?= =?utf-8?B?ejh4UWFqNFNwWU92NHFKaVJZTnRiUm8xR05sTHRvREZ6WnAwanl4c3F2OWNJ?= =?utf-8?B?VEZZbGNEc0p5MlpScVdjZnUvbU53WU9ra3RQb2U2RE44MkdwMWNxMHVnbWkv?= =?utf-8?B?QTdlVWU1eXgrdmNybjFDV0g3bkM3U0xuZ0p2ZTZCVkg3TFVxVlA2UFdiaWgw?= =?utf-8?B?a1ZhSmdpcjdzNTJueFo3RmJZVFRqSy9ybG53bWhubXhBRFYrRmhGS25IeS9C?= =?utf-8?B?QTM0V3dscnMzcjRHSDZGNmVNL1VjZzUrTG5wZ3h6a2pSdUFiaXVCbmdHbStz?= =?utf-8?B?NHdVRWJtN243SW5QRXEwTXR6bXU4dEdkRFU1eGdFakRWMzY2d2g5dDlPUDRH?= =?utf-8?B?WXludXZaazZPdmhUS0ltaUJ3d3J2WGEyS244Tk5pSlg4N3hpVEtUUkdEbWtz?= =?utf-8?B?czJjdjh3ckk4RS9JeDVMbTdvcXhJZHd4MGxFOEZ5Rkg2MC84U2YyVG1OOW10?= =?utf-8?B?bVhTUEIzcFdQSWhhZlB5WFlMam9vY0Ixa25PU0ZhWW9oLzhJejNJbHp1MFpG?= =?utf-8?B?UkxZRlpaY1JCMEhPY3lBbnFSeXhkQktYNUkwNkVXUTBkakowa1VoU2tyNFRH?= =?utf-8?B?ZEwrWlpYRDA3Q2V5MFI1UCtQUm5oOFRTYks5ZnpxTks2bVhwUHVSRG1xcnlW?= =?utf-8?Q?q3uCv8j2p95XOkFKrkZGWLu8uDcnA6KS3hl+Dt3jn?= X-Microsoft-Antispam-Message-Info: 90OhQXeZDGcujSIqNyOJpAi65BU7ZLvIa2zrk9QDhU1/CKEjP8jG+nQxpQo4qiqODivFfnfF4uMdjZEe67l5nbtYGqYrUifZQ3Y0fposRWcI2l+W+ZngUzS/JANP4SNJZPDozLW4sUexDKUQyAVf/bHP2CKJTJ+0z2aXjv4gARa03umh3mrNxefqhsX3YkHh X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0178; 6:X6CTEyDmm3pDiBZC4vzOXjFCCmqMkggfxpiRfl2sE9vyNv9oGI09rmDvOBOt1VO88WuwOra4B3HkTT2w10yzAwxkMkSRQGlq4D4i4dR43F2L2dE4ZJqe5GGWHVhy6XZd3pg6apQh85qvRMwhxn4xK46Lktoz18R2wiIXYDQZBswAksrSiZco3gYzfPiylX6ZtmpGqVIBvHRdb+PzbO53JlClfGOCWN2kAfZh/tMK++ADXZqoIhKiqo94kCXf/rSh4yp2TWJJhUuLtbEhfPbG9wK39jMKB0HJaJFPWsKVF7AZJ9xYVUttSwQUzjjJTTEheScxgGP5V30CzR8UWMHNO0P6YVKx6PqC85tKwY+eeMPTtrMox1klAi+pB8/R7bRyfdR20rnrwH3FnXvJGKv7BB+lQ5PwfTPyxlGoIiCHr+GXeRhyWnfkwI0hYIp+dhOSNEa513g4cdShIfUGTfR/gA==; 5:bWnX6k1Kw+4xPfk1fEjZBRH6kx3ConFBBadQaCP4asAD/lG8RLkIQIbfZdsHPCNS9B8ZrLUuSS39BfzF4bBGyTBDDd1pTMkO3BDZZn/AGV44crzb6QgvP6kzxtHX9iga3f/6l/ZbAxXAQHsGKK/IiMtXE94SFgxpmmY1HPagkSc=; 24:quRu+b3yVLQRaVUg40MNMXXkqVCtI5tMnPXU3ZDyPHWx6C/JGWd5B8Tp0qeroOAe9dv5uwHwwDof9GJSRRF0qRfxCJ00F6fe9KjpPLQ3HY8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB0178; 7:+c1Ahedf4k6rwBSbSMkIwpwsO2mHrxoeSjWqNEAmSwB/QAY/r+b6QX0Fb3F7gtrs62jrJm6d73JlBXkS9uxbtP/3RftSJRHWJ7GPJq0jxWpg5mhfbljtQZ/iOk2mgzo/TNRRahiHm7uvuHsQcUqunyN9/ojjX6myfdDCDOfk0f6U56/3wcbvTDTd4vZ7rKYY8fsIMuY6txyb7E1V3JNbweygCDtbWwryhTqoZHqw/+BOGucI1GW1vyJR7rhr4l/F X-OriginatorOrg: invensense.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2018 14:57:15.5041 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bcaf41e3-cb67-4981-fef0-08d59e2a2f2a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 462b3b3b-e42b-47ea-801a-f1581aac892d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0178 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some functions are turning the chip on and not back off in error path. With set_power function using a reference counter that would keep the chip on forever. Signed-off-by: Jean-Baptiste Maneyrol --- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 12 ++++++--- drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 35 ++++++++++++++++++--------- 2 files changed, 32 insertions(+), 15 deletions(-) /** diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 7d64be3..18c8866 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -262,27 +262,31 @@ static int inv_mpu6050_init_config(struct iio_dev *indio_dev) d = (INV_MPU6050_FSR_2000DPS << INV_MPU6050_GYRO_CONFIG_FSR_SHIFT); result = regmap_write(st->map, st->reg->gyro_config, d); if (result) - return result; + goto error_power_off; result = inv_mpu6050_set_lpf_regs(st, INV_MPU6050_FILTER_20HZ); if (result) - return result; + goto error_power_off; d = INV_MPU6050_ONE_K_HZ / INV_MPU6050_INIT_FIFO_RATE - 1; result = regmap_write(st->map, st->reg->sample_rate_div, d); if (result) - return result; + goto error_power_off; d = (INV_MPU6050_FS_02G << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT); result = regmap_write(st->map, st->reg->accl_config, d); if (result) - return result; + goto error_power_off; memcpy(&st->chip_config, hw_info[st->chip_type].config, sizeof(struct inv_mpu6050_chip_config)); result = inv_mpu6050_set_power_itg(st, false); return result; + +error_power_off: + inv_mpu6050_set_power_itg(st, false); + return result; } static int inv_mpu6050_sensor_set(struct inv_mpu6050_state *st, int reg, diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c index f963f9f..27aa976 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c @@ -53,45 +53,58 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable) result = inv_mpu6050_switch_engine(st, true, INV_MPU6050_BIT_PWR_GYRO_STBY); if (result) - return result; + goto error_power_off; } if (st->chip_config.accl_fifo_enable) { result = inv_mpu6050_switch_engine(st, true, INV_MPU6050_BIT_PWR_ACCL_STBY); if (result) - return result; + goto error_gyro_off; } result = inv_reset_fifo(indio_dev); if (result) - return result; + goto error_accl_off; } else { result = regmap_write(st->map, st->reg->fifo_en, 0); if (result) - return result; + goto error_accl_off; result = regmap_write(st->map, st->reg->int_enable, 0); if (result) - return result; + goto error_accl_off; result = regmap_write(st->map, st->reg->user_ctrl, 0); if (result) - return result; + goto error_accl_off; result = inv_mpu6050_switch_engine(st, false, - INV_MPU6050_BIT_PWR_GYRO_STBY); + INV_MPU6050_BIT_PWR_ACCL_STBY); if (result) - return result; + goto error_accl_off; result = inv_mpu6050_switch_engine(st, false, - INV_MPU6050_BIT_PWR_ACCL_STBY); + INV_MPU6050_BIT_PWR_GYRO_STBY); if (result) - return result; + goto error_gyro_off; + result = inv_mpu6050_set_power_itg(st, false); if (result) - return result; + goto error_power_off; } return 0; + +error_accl_off: + if (st->chip_config.accl_fifo_enable) + inv_mpu6050_switch_engine(st, false, + INV_MPU6050_BIT_PWR_ACCL_STBY); +error_gyro_off: + if (st->chip_config.gyro_fifo_enable) + inv_mpu6050_switch_engine(st, false, + INV_MPU6050_BIT_PWR_GYRO_STBY); +error_power_off: + inv_mpu6050_set_power_itg(st, false); + return result; }