* [PATCH] colibri : don't register pxa2xx-pcmcia nodes on non-colibri platforms
@ 2011-02-22 23:30 Dmitry Eremin-Solenikov
2011-02-27 13:33 ` Eric Miao
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-02-22 23:30 UTC (permalink / raw)
To: linux-arm-kernel
PXA supports multi-machine kernels since long ago. However a kernel
compiled with support for colibri and any other PXA machine and with
PCMCIA enabled will barf at runtime about duplicate registration of
pxa2xx-pcmcia device. Fix that.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/pcmcia/pxa2xx_colibri.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c
index c3f7219..a520395 100644
--- a/drivers/pcmcia/pxa2xx_colibri.c
+++ b/drivers/pcmcia/pxa2xx_colibri.c
@@ -181,6 +181,9 @@ static int __init colibri_pcmcia_init(void)
{
int ret;
+ if (!machine_is_colibri() && !machine_is_colibri320())
+ return -ENODEV;
+
colibri_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
if (!colibri_pcmcia_device)
return -ENOMEM;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] colibri : don't register pxa2xx-pcmcia nodes on non-colibri platforms
2011-02-22 23:30 [PATCH] colibri : don't register pxa2xx-pcmcia nodes on non-colibri platforms Dmitry Eremin-Solenikov
@ 2011-02-27 13:33 ` Eric Miao
0 siblings, 0 replies; 2+ messages in thread
From: Eric Miao @ 2011-02-27 13:33 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Feb 23, 2011 at 7:30 AM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> PXA supports multi-machine kernels since long ago. However a kernel
> compiled with support for colibri and any other PXA machine and with
> PCMCIA enabled will barf at runtime about duplicate registration of
> pxa2xx-pcmcia device. Fix that.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Applied to 'fix'.
> ---
> ?drivers/pcmcia/pxa2xx_colibri.c | ? ?3 +++
> ?1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pcmcia/pxa2xx_colibri.c b/drivers/pcmcia/pxa2xx_colibri.c
> index c3f7219..a520395 100644
> --- a/drivers/pcmcia/pxa2xx_colibri.c
> +++ b/drivers/pcmcia/pxa2xx_colibri.c
> @@ -181,6 +181,9 @@ static int __init colibri_pcmcia_init(void)
> ?{
> ? ? ? ?int ret;
>
> + ? ? ? if (!machine_is_colibri() && !machine_is_colibri320())
> + ? ? ? ? ? ? ? return -ENODEV;
> +
> ? ? ? ?colibri_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
> ? ? ? ?if (!colibri_pcmcia_device)
> ? ? ? ? ? ? ? ?return -ENOMEM;
> --
> 1.7.2.3
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-27 13:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 23:30 [PATCH] colibri : don't register pxa2xx-pcmcia nodes on non-colibri platforms Dmitry Eremin-Solenikov
2011-02-27 13:33 ` Eric Miao
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).