From: Chao Xie <chao.xie@marvell.com>
To: <sameo@linux.intel.com>, <lee.jones@linaro.org>,
<linux-kernel@vger.kernel.org>, <xiechao.mail@gmail.com>
Cc: Chao Xie <chao.xie@marvell.com>
Subject: [PATCH 1/2] mfd: 88pm800: Fix the bug that pdata may be NULL
Date: Sun, 18 Aug 2013 21:27:54 -0400 [thread overview]
Message-ID: <1376875675-11286-2-git-send-email-chao.xie@marvell.com> (raw)
In-Reply-To: <1376875675-11286-1-git-send-email-chao.xie@marvell.com>
User pass platform data to device, and platform data may be
NULL. Add the check for pdata.
Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
drivers/mfd/88pm800.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 6c95483..d4d272f 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -333,9 +333,11 @@ static int device_rtc_init(struct pm80x_chip *chip,
{
int ret;
- rtc_devs[0].platform_data = pdata->rtc;
- rtc_devs[0].pdata_size =
- pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0;
+ if (pdata) {
+ rtc_devs[0].platform_data = pdata->rtc;
+ rtc_devs[0].pdata_size =
+ pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0;
+ }
ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
ARRAY_SIZE(rtc_devs), NULL, 0, NULL);
if (ret) {
@@ -578,7 +580,7 @@ static int pm800_probe(struct i2c_client *client,
goto err_device_init;
}
- if (pdata->plat_config)
+ if (pdata && pdata->plat_config)
pdata->plat_config(chip, pdata);
return 0;
--
1.7.4.1
next prev parent reply other threads:[~2013-08-19 1:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-19 1:27 [PATCH 0/2] mfd: 88pm8xx: platform data bug fix Chao Xie
2013-08-19 1:27 ` Chao Xie [this message]
2013-08-20 1:40 ` [PATCH 1/2] mfd: 88pm800: Fix the bug that pdata may be NULL Samuel Ortiz
2013-08-27 6:11 ` Chao Xie
2013-08-30 12:30 ` Samuel Ortiz
2013-09-02 1:21 ` Chao Xie
2013-09-02 8:50 ` Samuel Ortiz
2013-08-19 1:27 ` [PATCH 2/2] mfd: 88pm805: " Chao Xie
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=1376875675-11286-2-git-send-email-chao.xie@marvell.com \
--to=chao.xie@marvell.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=xiechao.mail@gmail.com \
/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
all inboxes | Powered by JetHome®