Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp66376ybl; Thu, 5 Dec 2019 15:16:14 -0800 (PST) X-Google-Smtp-Source: APXvYqxCBLnsbR67QYf5mLS3RnVBOkW9/tMh4Ng5oZVsPwzV3+vA9YDAV7orgbaGlG9fzLclw4Ka X-Received: by 2002:a9d:6c06:: with SMTP id f6mr8388970otq.318.1575587774213; Thu, 05 Dec 2019 15:16:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575587774; cv=none; d=google.com; s=arc-20160816; b=cevaR9e1uYAP+jOMlvZFd86Tv6AdiUD5rgxlD5Qa8cLdw5DtXEQ3ZgBV558uL4/hbz Zk4DJInZBO0rNK/NGFRVnnUjOd26+QwSz4+haSbBaiH0/vYjmC+Z3Gx2L6U1TnUVbO6a skOl5kg2SHXjkqQeVxx6EDKtA3Lvm6NZdZOOSqS5xZ4Q3Mx+GJCMqrQV5AQxsO7fH3US myJEHUvOjLZj4PMlCXUNXc1RwJWVPnE3yvrSddByiTQ3ubuDMQPrP35CYo7gmMKBqMVp hFbnmdeOjVTloyhrzQ+6FaZvAE/oKx3yvjdZM3JVcxn+xlPFHQvG4m3MZswbT3nXnHb8 /a9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=oSYnes0/l1u+4rIUZLMW/yKpeiqYc5kOnZtn2XTe1+4=; b=Xmpg3uu/zpOQKAwPrcnH4gTkRiw7sZSLue3jQqsL69XnKQxZvU75s9GH3xsuQm+rZX ICOib6ZcJ0fTOzOo7pDhsKvRrpjNO6S7Lj0BcQGoLkBZDl9u3zpV49PutLqkWwwCgRsx 90rZgg8XJewH2krILcBRr5gHKTq0IincOZ5W3BljeVvexvfRXNto/MJbEG5YRVPp99Iz tqgGuOhNxwLzHU5wTe50EqkpOT7huqb/uSnB/Ijxf+j9MpMnXV/uti82iSE2y6Bb5R18 1AeSAuyPBLTrd2IBjqdl0NjYE+e6PvmOWu/JfRHE92DMS1QU9GHZwPClQsZ+0mFjOJ9Q viMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=X9WHG7rg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m1si3577802otf.174.2019.12.05.15.15.30; Thu, 05 Dec 2019 15:16:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=X9WHG7rg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726047AbfLEXO1 (ORCPT + 99 others); Thu, 5 Dec 2019 18:14:27 -0500 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:42612 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725927AbfLEXO1 (ORCPT ); Thu, 5 Dec 2019 18:14:27 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 47TWkp1jHlz9vklR for ; Thu, 5 Dec 2019 23:14:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0GIaP6le0V1G for ; Thu, 5 Dec 2019 17:14:26 -0600 (CST) Received: from mail-yw1-f71.google.com (mail-yw1-f71.google.com [209.85.161.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 47TWkp0WvCz9vklF for ; Thu, 5 Dec 2019 17:14:26 -0600 (CST) Received: by mail-yw1-f71.google.com with SMTP id i70so3760256ywe.23 for ; Thu, 05 Dec 2019 15:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=oSYnes0/l1u+4rIUZLMW/yKpeiqYc5kOnZtn2XTe1+4=; b=X9WHG7rgvwbxw7JgkQDFD0KoZjBvbTkWObbXVHZ2899dH/a4k32yNqM14o9vSaifdk y0ODLMeZIUC96L+JdSPfLbLcI/yEApv/yVGB3FzktZqL+ZBKQ6NhWKBAmqrmZj1LV/OO 14gIkdUKkJXjIXt5L/UC2fKDhoQv6TJPhYX4cjlqmxsQyMime7tgHwuQrqXOJjmUraJV uIRVeyUfyRyLcsC3fA2UTx3a9MsMK9voa5m9oXcbUyeJolSY7MeFSBzkNuOJxmlRcfP5 D1tUy8qpYW/YuBUN21HwKjywMavWUB1lT0GyA4mBsMuRwhwm0ULlplKhT4s+s0doRzuz tTEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oSYnes0/l1u+4rIUZLMW/yKpeiqYc5kOnZtn2XTe1+4=; b=LPdRt2AEDkyHnfnLmyznAbFkmoVj3ZA5uO3/0fG0nTc0oIYBasJq4GfSecOcY1B07s fceWO7zzqSA4gdDLNTD3LlM8A2DdAU0aaTBDKIntAWccNo4W2kb8cnq1ubF5GW6CUE3d agQ774z3XYqtp5mGmnG/ji8zp2txopb5Zxwlm/Z1PTNw7Q0p51RCMZLDbyJ87x50H/A/ cd0Tck+QHGRgN6oaKjjCYOjFHQRhkfQdogEA1TLv4lPNv/YWFpM7PCZzYUnnhZqVsYg6 vAuoQMCJO/eAWvfMBX4siKtpoLXrtK3wAyDcazALsq0exhhlnah8V2CK1DkztsAq5Pm5 Qvjg== X-Gm-Message-State: APjAAAXQYNK9dmjvaEjM2ZWO9SUjxrHzqJlEQmpHE3n562wZ9vA3ZlhY jI2crrXXtBzjkCsJUYLiuhrcsU/C7wQKxOZzjuJrEWjbJaiiKPa7wwyidNBp6j2vIE08EHaet9/ j1Px1p475zZyILytJRWu0lzBRcf95 X-Received: by 2002:a25:7c44:: with SMTP id x65mr7863558ybc.382.1575587665408; Thu, 05 Dec 2019 15:14:25 -0800 (PST) X-Received: by 2002:a25:7c44:: with SMTP id x65mr7863541ybc.382.1575587665127; Thu, 05 Dec 2019 15:14:25 -0800 (PST) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id e198sm5681470ywa.51.2019.12.05.15.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Dec 2019 15:14:24 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] spi: dw: Avoid BUG_ON() in case of host failure Date: Thu, 5 Dec 2019 17:14:21 -0600 Message-Id: <20191205231421.9333-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If dws is NULL in dw_spi_host_add(), we return the error to the upper callers instead of crashing. The patch replaces BUG_ON by returning -EINVAL to the caller. Signed-off-by: Aditya Pakki --- drivers/spi/spi-dw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index a92aa5cd4fbe..a160d9a141ea 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -460,7 +460,8 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) struct spi_controller *master; int ret; - BUG_ON(dws == NULL); + if (!dws) + return -EINVAL; master = spi_alloc_master(dev, 0); if (!master) -- 2.17.1