From c1b4bd5c18e29b539f75caf8fc46ebb211298af7 Mon Sep 17 00:00:00 2001 From: Tushar Behera Date: Tue, 20 Nov 2012 09:41:53 +0530 Subject: [PATCH] --- yaml --- r: 336303 b: refs/heads/master c: ab5023efdcfa87512663aca120245b0fec8511eb h: refs/heads/master i: 336301: bc085318af9d51c641c45667f0d754c0dbb85a16 336299: 242ac66fe09317649e12fee4cd1635a5166adec2 336295: 68d8875986ce90d09f389f70f96a1789176af410 336287: 87a5e5c70fadb26d554b31167bf34138ac2e6941 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-s3c.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2fa7f7abbe36..c98c795894d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7e968799bbc1e7d6e56a77abd62c714509040c4 +refs/heads/master: ab5023efdcfa87512663aca120245b0fec8511eb diff --git a/trunk/drivers/mmc/host/sdhci-s3c.c b/trunk/drivers/mmc/host/sdhci-s3c.c index c9ec725884e5..47bb04390f9c 100644 --- a/trunk/drivers/mmc/host/sdhci-s3c.c +++ b/trunk/drivers/mmc/host/sdhci-s3c.c @@ -456,12 +456,12 @@ static int __devinit sdhci_s3c_parse_dt(struct device *dev, return -ENOMEM; /* get the card detection method */ - if (of_get_property(node, "broken-cd", 0)) { + if (of_get_property(node, "broken-cd", NULL)) { pdata->cd_type = S3C_SDHCI_CD_NONE; goto setup_bus; } - if (of_get_property(node, "non-removable", 0)) { + if (of_get_property(node, "non-removable", NULL)) { pdata->cd_type = S3C_SDHCI_CD_PERMANENT; goto setup_bus; }