* [PATCH 10/10] [PM-WIP-MMC] omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set
@ 2010-08-20 20:11 kishore kadiyala
2010-08-26 23:24 ` Kevin Hilman
0 siblings, 1 reply; 3+ messages in thread
From: kishore kadiyala @ 2010-08-20 20:11 UTC (permalink / raw)
To: linux-omap; +Cc: khilman, tony, b-cousson, adrian.hunter, akpm, madhu.cr
From: Benoit Cousson <b-cousson@ti.com
Avoid possible crash if CONFIG_MMC_OMAP_HS is not set
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
---
arch/arm/mach-omap2/board-4430sdp.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 9447644..3a0dafd 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -235,8 +235,13 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
{
- struct omap_mmc_platform_data *pdata = dev->platform_data;
+ struct omap_mmc_platform_data *pdata;
+
+ /* dev can be null if CONFIG_MMC_OMAP_HS is not set */
+ if (!dev)
+ return;
+ pdata = dev->platform_data;
pdata->init = omap4_twl6030_hsmmc_late_init;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 10/10] [PM-WIP-MMC] omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set
2010-08-20 20:11 [PATCH 10/10] [PM-WIP-MMC] omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set kishore kadiyala
@ 2010-08-26 23:24 ` Kevin Hilman
2010-08-27 14:20 ` kishore kadiyala
0 siblings, 1 reply; 3+ messages in thread
From: Kevin Hilman @ 2010-08-26 23:24 UTC (permalink / raw)
To: kishore kadiyala
Cc: linux-omap, tony, b-cousson, adrian.hunter, akpm, madhu.cr
"kishore kadiyala" <kishore.kadiyala@ti.com> writes:
> From: Benoit Cousson <b-cousson@ti.com
> Avoid possible crash if CONFIG_MMC_OMAP_HS is not set
>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Adrian Hunter <adrian.hunter@nokia.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
This is another fix that should go upstream independently of the rest of
the series.
In fact, this should probably be fixed in 2.6.36-rc.
Kevin
> ---
> arch/arm/mach-omap2/board-4430sdp.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index 9447644..3a0dafd 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -235,8 +235,13 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
>
> static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
> {
> - struct omap_mmc_platform_data *pdata = dev->platform_data;
> + struct omap_mmc_platform_data *pdata;
> +
> + /* dev can be null if CONFIG_MMC_OMAP_HS is not set */
> + if (!dev)
> + return;
>
> + pdata = dev->platform_data;
> pdata->init = omap4_twl6030_hsmmc_late_init;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 10/10] [PM-WIP-MMC] omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set
2010-08-26 23:24 ` Kevin Hilman
@ 2010-08-27 14:20 ` kishore kadiyala
0 siblings, 0 replies; 3+ messages in thread
From: kishore kadiyala @ 2010-08-27 14:20 UTC (permalink / raw)
To: Kevin Hilman
Cc: kishore kadiyala, linux-omap, tony, b-cousson, adrian.hunter,
akpm, madhu.cr
On Fri, Aug 27, 2010 at 4:54 AM, Kevin Hilman
<khilman@deeprootsystems.com> wrote:
> "kishore kadiyala" <kishore.kadiyala@ti.com> writes:
>
>> From: Benoit Cousson <b-cousson@ti.com
>> Avoid possible crash if CONFIG_MMC_OMAP_HS is not set
>>
>> Cc: Kevin Hilman <khilman@deeprootsystems.com>
>> Cc: Adrian Hunter <adrian.hunter@nokia.com>
>> Cc: Andrew Morton <akpm@linux-foundation.org>
>> Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
>> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
>> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
>
> This is another fix that should go upstream independently of the rest of
> the series.
>
> In fact, this should probably be fixed in 2.6.36-rc.
ok will post independently
Regards,
Kishore
>
> Kevin
>
>> ---
>> arch/arm/mach-omap2/board-4430sdp.c | 7 ++++++-
>> 1 files changed, 6 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
>> index 9447644..3a0dafd 100644
>> --- a/arch/arm/mach-omap2/board-4430sdp.c
>> +++ b/arch/arm/mach-omap2/board-4430sdp.c
>> @@ -235,8 +235,13 @@ static int omap4_twl6030_hsmmc_late_init(struct device *dev)
>>
>> static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
>> {
>> - struct omap_mmc_platform_data *pdata = dev->platform_data;
>> + struct omap_mmc_platform_data *pdata;
>> +
>> + /* dev can be null if CONFIG_MMC_OMAP_HS is not set */
>> + if (!dev)
>> + return;
>>
>> + pdata = dev->platform_data;
>> pdata->init = omap4_twl6030_hsmmc_late_init;
>> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-27 14:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-20 20:11 [PATCH 10/10] [PM-WIP-MMC] omap4 hsmmc: Fix the init if CONFIG_MMC_OMAP_HS is not set kishore kadiyala
2010-08-26 23:24 ` Kevin Hilman
2010-08-27 14:20 ` kishore kadiyala
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.