From patchwork Mon May 7 10:16:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 909653 X-Patchwork-Delegate: bartekgola@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="alH2qaSy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40fdpm5kbzz9ryk for ; Mon, 7 May 2018 20:17:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751889AbeEGKRI (ORCPT ); Mon, 7 May 2018 06:17:08 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:50279 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002AbeEGKRE (ORCPT ); Mon, 7 May 2018 06:17:04 -0400 Received: by mail-wm0-f66.google.com with SMTP id t11so12540407wmt.0 for ; Mon, 07 May 2018 03:17:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=0XFr3jMuFaqc/iW54Mr82eZSSrCrzS0gEy2apm7YLcc=; b=alH2qaSy7P25dqlWc1i7jpYwLzWa11g2hl9veh5kcR/YMGKNUFUyfmrkuKAr7xPS/6 9713eUgs8JkXwEXkjxodznaR1EWIBTl8MEsZx5keQRXiI/AYmiwuMOsaLPD/9GdgLSLZ aEzLFjLdmT/47hxvwOO++4YVyri1VnD4/w5av0v+izm99LBQD+Jf77/VO4Bf8USF2eyC YcbDcgfZbJWk26RAuB5bAtIFRaMsbYipQd5wP7z/UMSgh6/KU2OfozLr9L3Qlucn91N2 we8EDAxg9jZwEC7xPhjly5NF7AKKm4xvhu7h7B80uYdDaCxCQGdp4fSlyIjMduOVyC2J zRnA== 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=0XFr3jMuFaqc/iW54Mr82eZSSrCrzS0gEy2apm7YLcc=; b=mRidMbpLOYJ3G+kq4IYZgVgrX6REEJMwL0DJn9Hv1OwzA80KK66smPRHruvA78zDhd 5x/9B0+gl+W35Oq/5hxFXjOzP8zyOe71OtL8KrBxOYwQ/LjmBF1c+qCTfc9sUA3QomeS 1YxGT0J8reUFIp5pJ6cI0UvSy6kLUVWPC6mrTJSecjYW1j+boz2vNQh/t0ztyfLGqFkQ 6TLqCe3lxA38C7YkAo5If1pdXklPO6h/XQzM+BfK4adpAZWXPk9ik7FUfgIdaESgJ7P0 9e94xpp1CN5dt9zYegxOu7//1XFUTk7GKEfNH23NeLoJ9wy92vcUCzBPZj8Xhq4bMrMo KbHg== X-Gm-Message-State: ALQs6tB3urW6bLLZqW+bJnPFm9Ukh4kfzCpUtVlbMjBfiqmxkBRwtYNa KqiCvL61EoasNIUOTmCRU4Iy2XYop8Y= X-Google-Smtp-Source: AB8JxZpdJshRPqmcNRgqIdrAmi8G2f6QQR+lHwxSvXaZvPhPdSx2lOxXCWeEH3I9SlpuZT9VzGmE6w== X-Received: by 2002:a1c:41c1:: with SMTP id o184-v6mr390817wma.127.1525688223295; Mon, 07 May 2018 03:17:03 -0700 (PDT) Received: from brgl-bgdev.lan (LFbn-NIC-1-84-58.w2-15.abo.wanadoo.fr. [2.15.173.58]) by smtp.gmail.com with ESMTPSA id z192-v6sm1384836wmc.10.2018.05.07.03.17.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 May 2018 03:17:02 -0700 (PDT) From: Bartosz Golaszewski To: Vadim Pasternak , Andy Shevchenko Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH] eeprom: at24: fix retrieving the at24_chip_data structure Date: Mon, 7 May 2018 12:16:58 +0200 Message-Id: <20180507101658.7788-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Commit feb2f19b1e8f ("eeprom: at24: move platform data processing into a separate routine") introduced a bug where we incorrectly retireve the at24_chip_data structure. Remove the unnecessary ampersand operator. Fixes: feb2f19b1e8f ("eeprom: at24: move platform data processing into a separate routine") Reported-by: Vadim Pasternak Signed-off-by: Bartosz Golaszewski --- drivers/misc/eeprom/at24.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 0c125f207aea..33053b0d1fdf 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -518,7 +518,7 @@ static int at24_get_pdata(struct device *dev, struct at24_platform_data *pdata) if (of_node && of_match_device(at24_of_match, dev)) cdata = of_device_get_match_data(dev); else if (id) - cdata = (void *)&id->driver_data; + cdata = (void *)id->driver_data; else cdata = acpi_device_get_match_data(dev);