From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
alan@lxorguk.ukuu.org.uk, Prarit Bhargava <prarit@redhat.com>,
Mauro Carvalho Chehab <mchehab@redhat.com>,
Shuah Khan <shuah.khan@hp.com>
Subject: [ 19/27] i7core_edac: fix panic when accessing sysfs files
Date: Thu, 6 Dec 2012 16:59:03 -0800 [thread overview]
Message-ID: <20121207005831.466804325@linuxfoundation.org> (raw)
In-Reply-To: <20121207005825.232489605@linuxfoundation.org>
3.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prarit Bhargava <prarit@redhat.com>
commit 42709efb3a47524c6252e1bdc85e205f7bc356fb upstream.
The i7core_edac addrmatch_dev and chancounts_dev have sysfs files
associated with them. The sysfs files, however, are coded so that the
parent device is is the mci device. This is incorrect and the mci struct
should be obtained through the addrmatch_dev and chancounts_dev device's
private data field which is populated in i7core_create_sysfs_devices().
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Shuah Khan <shuah.khan@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/edac/i7core_edac.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -816,7 +816,7 @@ static ssize_t i7core_inject_store_##par
struct device_attribute *mattr, \
const char *data, size_t count) \
{ \
- struct mem_ctl_info *mci = to_mci(dev); \
+ struct mem_ctl_info *mci = dev_get_drvdata(dev); \
struct i7core_pvt *pvt; \
long value; \
int rc; \
@@ -845,7 +845,7 @@ static ssize_t i7core_inject_show_##para
struct device_attribute *mattr, \
char *data) \
{ \
- struct mem_ctl_info *mci = to_mci(dev); \
+ struct mem_ctl_info *mci = dev_get_drvdata(dev); \
struct i7core_pvt *pvt; \
\
pvt = mci->pvt_info; \
@@ -1052,7 +1052,7 @@ static ssize_t i7core_show_counter_##par
struct device_attribute *mattr, \
char *data) \
{ \
- struct mem_ctl_info *mci = to_mci(dev); \
+ struct mem_ctl_info *mci = dev_get_drvdata(dev); \
struct i7core_pvt *pvt = mci->pvt_info; \
\
edac_dbg(1, "\n"); \
next prev parent reply other threads:[~2012-12-07 0:59 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-07 0:58 [ 00/27] 3.6.10-stable review Greg Kroah-Hartman
2012-12-07 0:58 ` [ 01/27] Dove: Attempt to fix PMU/RTC interrupts Greg Kroah-Hartman
2012-12-07 0:58 ` [ 02/27] Dove: Fix irq_to_pmu() Greg Kroah-Hartman
2012-12-07 0:58 ` [ 03/27] drm/radeon/dce4+: dont use radeon_crtc for vblank callback Greg Kroah-Hartman
2012-12-07 0:58 ` [ 04/27] drm/radeon: properly handle mc_stop/mc_resume on evergreen+ (v2) Greg Kroah-Hartman
2012-12-07 0:58 ` [ 05/27] drm/radeon: properly track the crtc not_enabled case evergreen_mc_stop() Greg Kroah-Hartman
2012-12-07 0:58 ` [ 06/27] mm/vmemmap: fix wrong use of virt_to_page Greg Kroah-Hartman
2012-12-07 0:58 ` [ 07/27] mm: vmscan: fix endless loop in kswapd balancing Greg Kroah-Hartman
2012-12-07 0:58 ` [ 08/27] mm: soft offline: split thp at the beginning of soft_offline_page() Greg Kroah-Hartman
2012-12-07 0:58 ` [ 09/27] target: Fix handling of aborted commands Greg Kroah-Hartman
2012-12-07 0:58 ` [ 10/27] iwlwifi: fix the basic CCK rates calculation Greg Kroah-Hartman
2012-12-07 0:58 ` [ 11/27] ARM: Kirkwood: Update PCI-E fixup Greg Kroah-Hartman
2012-12-07 0:58 ` [ 12/27] x86, fpu: Avoid FPU lazy restore after suspend Greg Kroah-Hartman
2012-12-07 0:58 ` [ 13/27] workqueue: exit rescuer_thread() as TASK_RUNNING Greg Kroah-Hartman
2012-12-07 0:58 ` [ 14/27] mac80211: fix remain-on-channel (non-)cancelling Greg Kroah-Hartman
2012-12-07 0:58 ` [ 15/27] md/raid1{,0}: fix deadlock in bitmap_unplug Greg Kroah-Hartman
2012-12-07 0:59 ` [ 16/27] i7300_edac: Fix error flag testing Greg Kroah-Hartman
2012-12-07 0:59 ` [ 17/27] Revert "sched, autogroup: Stop going ahead if autogroup is disabled" Greg Kroah-Hartman
2012-12-07 17:22 ` Joseph Salisbury
2012-12-07 17:30 ` Joseph Salisbury
2012-12-09 23:41 ` Ben Hutchings
2012-12-07 17:31 ` Greg Kroah-Hartman
2012-12-07 17:43 ` Joseph Salisbury
2012-12-07 0:59 ` [ 18/27] bnx2x: remove redundant warning log Greg Kroah-Hartman
2012-12-07 0:59 ` Greg Kroah-Hartman [this message]
2012-12-07 0:59 ` [ 20/27] s390/mm: have 16 byte aligned struct pages Greg Kroah-Hartman
2012-12-07 10:00 ` Heiko Carstens
2012-12-07 15:07 ` Greg Kroah-Hartman
2012-12-07 0:59 ` [ 21/27] net: qmi_wwan: adding more ZTE devices Greg Kroah-Hartman
2012-12-07 0:59 ` [ 22/27] net: qmi_wwan: add Huawei E173 Greg Kroah-Hartman
2012-12-07 0:59 ` [ 23/27] ACPI: missing break Greg Kroah-Hartman
2012-12-07 0:59 ` [ 24/27] i915: Quirk no_lvds on Gigabyte GA-D525TUD ITX motherboard Greg Kroah-Hartman
2012-12-07 4:36 ` Calvin Walton
2012-12-07 16:37 ` Greg Kroah-Hartman
2012-12-07 0:59 ` [ 25/27] drm/i915: Add no-lvds quirk for Supermicro X7SPA-H Greg Kroah-Hartman
2012-12-07 0:59 ` [ 26/27] x86, amd: Disable way access filter on Piledriver CPUs Greg Kroah-Hartman
2012-12-07 0:59 ` [ 27/27] 8139cp: revert "set ring address before enabling receiver" Greg Kroah-Hartman
2012-12-07 13:36 ` [ 00/27] 3.6.10-stable review Holger Hoffstaette
2012-12-08 0:46 ` Shuah Khan
2012-12-08 0:58 ` Shuah Khan
2012-12-08 5:40 ` satoru takeuchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121207005831.466804325@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=prarit@redhat.com \
--cc=shuah.khan@hp.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).