From patchwork Thu Oct 27 18:24:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9400163 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 252DC6057E for ; Thu, 27 Oct 2016 18:24:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18DE52A37B for ; Thu, 27 Oct 2016 18:24:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DB882A37D; Thu, 27 Oct 2016 18:24:34 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 ADAFD2A37B for ; Thu, 27 Oct 2016 18:24:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936570AbcJ0SYd (ORCPT ); Thu, 27 Oct 2016 14:24:33 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:32837 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935747AbcJ0SYc (ORCPT ); Thu, 27 Oct 2016 14:24:32 -0400 Received: by mail-wm0-f65.google.com with SMTP id m83so3948666wmc.0 for ; Thu, 27 Oct 2016 11:24:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=beCcY6RoLNtGLJPBrPIFv8g4ln/7Qw5ygqKziBKFUmA=; b=ZgwbpRX5hq3bndqP3q9j47/HMyUkN9F/9RdRN6LN+WJGiU12Qeyj8Rnjgn8q+3Q+l8 L2DtrUXkSwAkqso73qG8MPmbZvBJQHq2JPJlyhGYDh7eshkUEMnRlkIgK3dzooBFsKVc b/nNMp/CFa/KLFkUG60/0klRSh4LYg4t2kmEjWT8LGO3k0zqIYWygFroenLL3wSk0u5Q 3jU9pku7knInECb1dhDhhTlg5l7WQ0euq9cIemVlSe9mKXGmpZvbFTVocHfMv42w00g0 Xq/0gKSc2C6JYoO8//0vULk11ZAjooe5nW1VhOXx1pEV/gLMaEV7YSkZZsyQ+tdr55iL LzCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=beCcY6RoLNtGLJPBrPIFv8g4ln/7Qw5ygqKziBKFUmA=; b=SXkeJTPGqS5lSTKqCBGAAP7gP/02H8rZAB615Dpye0X74UATNbzxrwt9z+HKIkLaaI HIHJgjKIvdkZVLdB39U34anCZl5+xAF/n+J75SvZjEEVGsFjWvP5I52mb6AadG7/FnrL Ui8tHvEwwQF1tBink4AV2zZinw9SuvhdQ4+qe4mGOf0+7b5kixj25hcp8eNLuNBPgRzJ ooTH2w5vWjGRQ5TajjvC96L3CWEnF4Hpc3DJbpIImOXcK4EOjCec37hT8mHc8vzdyyu7 Gvbmm75FvT1ZOUoqxiLjzwM4CyECPX9zLvnzJpUJkwsnZ2YGo/MTXbO0xcQkhIvDOdMo lDPg== X-Gm-Message-State: ABUngvfc1yp4733zMLEBgtt7wveZcVokuHF6z4TEvKtDUgJlYOwQqFBFfibi0/vbF1WllA== X-Received: by 10.28.99.213 with SMTP id x204mr28202wmb.111.1477592671350; Thu, 27 Oct 2016 11:24:31 -0700 (PDT) Received: from ?IPv6:2003:62:5f6e:ba00:49f8:f47b:2191:41c4? (p200300625F6EBA0049F8F47B219141C4.dip0.t-ipconnect.de. [2003:62:5f6e:ba00:49f8:f47b:2191:41c4]) by smtp.googlemail.com with ESMTPSA id g142sm4656344wmd.2.2016.10.27.11.24.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 11:24:31 -0700 (PDT) To: Mark Brown Cc: Arnd Bergmann , "linux-spi@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH] spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error" Message-ID: Date: Thu, 27 Oct 2016 20:24:19 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 5c0ba57744b1 ("spi: fsl-espi: avoid processing uninitalized data on error") applied fine to stable but caused a merge conflict on next. This patch fixes that. Signed-off-by: Heiner Kallweit --- drivers/spi/spi-fsl-espi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index a7e4c28..4e8a99d 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -456,7 +456,7 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events) mspi->len -= rx_nr_bytes; if (rx_nr_bytes && mspi->rx) { - mspi->get_rx(rx_data, mspi); + *(u32 *)mspi->rx = rx_data; mspi->rx += 4; } }