* [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform
@ 2011-04-01 9:28 Dmitry Eremin-Solenikov
2011-04-01 9:28 ` [PATCH 2/2] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform Dmitry Eremin-Solenikov
2011-04-04 6:47 ` [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform Eric Miao
0 siblings, 2 replies; 4+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-04-01 9:28 UTC (permalink / raw)
To: linux-arm-kernel
pxa2xx_balloon3 tries to register pxa2xx-pcmcia device not checking whether
machine is really balloon3, thus messing multi-machine kernels. Fix it up.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/pcmcia/pxa2xx_balloon3.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
index 453c54c..4c3e94c 100644
--- a/drivers/pcmcia/pxa2xx_balloon3.c
+++ b/drivers/pcmcia/pxa2xx_balloon3.c
@@ -25,6 +25,8 @@
#include <mach/balloon3.h>
+#include <asm/mach-types.h>
+
#include "soc_common.h"
/*
@@ -127,6 +129,9 @@ static int __init balloon3_pcmcia_init(void)
{
int ret;
+ if (!machine_is_balloon3())
+ return -ENODEV;
+
balloon3_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
if (!balloon3_pcmcia_device)
return -ENOMEM;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform
2011-04-01 9:28 [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform Dmitry Eremin-Solenikov
@ 2011-04-01 9:28 ` Dmitry Eremin-Solenikov
2011-04-04 6:46 ` Eric Miao
2011-04-04 6:47 ` [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform Eric Miao
1 sibling, 1 reply; 4+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-04-01 9:28 UTC (permalink / raw)
To: linux-arm-kernel
pxa2xx_trizeps4 tries to register pxa2xx-pcmcia device not checking whether
machine is really trizeps4, thus messing multi-machine kernels. Fix it up.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/pcmcia/pxa2xx_trizeps4.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index b7e5966..5bb4e1a 100644
--- a/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/drivers/pcmcia/pxa2xx_trizeps4.c
@@ -226,6 +226,9 @@ static int __init trizeps_pcmcia_init(void)
{
int ret;
+ if (!machine_is_trizeps4() && !machine_is_trizeps4wl())
+ return -ENODEV;
+
trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
if (!trizeps_pcmcia_device)
return -ENOMEM;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform
2011-04-01 9:28 ` [PATCH 2/2] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform Dmitry Eremin-Solenikov
@ 2011-04-04 6:46 ` Eric Miao
0 siblings, 0 replies; 4+ messages in thread
From: Eric Miao @ 2011-04-04 6:46 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Apr 1, 2011 at 5:28 PM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> pxa2xx_trizeps4 tries to register pxa2xx-pcmcia device not checking whether
> machine is really trizeps4, thus messing multi-machine kernels. Fix it up.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Applied.
> ---
> ?drivers/pcmcia/pxa2xx_trizeps4.c | ? ?3 +++
> ?1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
> index b7e5966..5bb4e1a 100644
> --- a/drivers/pcmcia/pxa2xx_trizeps4.c
> +++ b/drivers/pcmcia/pxa2xx_trizeps4.c
> @@ -226,6 +226,9 @@ static int __init trizeps_pcmcia_init(void)
> ?{
> ? ? ? ?int ret;
>
> + ? ? ? if (!machine_is_trizeps4() && !machine_is_trizeps4wl())
> + ? ? ? ? ? ? ? return -ENODEV;
> +
> ? ? ? ?trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
> ? ? ? ?if (!trizeps_pcmcia_device)
> ? ? ? ? ? ? ? ?return -ENOMEM;
> --
> 1.7.4.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform
2011-04-01 9:28 [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform Dmitry Eremin-Solenikov
2011-04-01 9:28 ` [PATCH 2/2] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform Dmitry Eremin-Solenikov
@ 2011-04-04 6:47 ` Eric Miao
1 sibling, 0 replies; 4+ messages in thread
From: Eric Miao @ 2011-04-04 6:47 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Apr 1, 2011 at 5:28 PM, Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com> wrote:
> pxa2xx_balloon3 tries to register pxa2xx-pcmcia device not checking whether
> machine is really balloon3, thus messing multi-machine kernels. Fix it up.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Applied.
> ---
> ?drivers/pcmcia/pxa2xx_balloon3.c | ? ?5 +++++
> ?1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pcmcia/pxa2xx_balloon3.c b/drivers/pcmcia/pxa2xx_balloon3.c
> index 453c54c..4c3e94c 100644
> --- a/drivers/pcmcia/pxa2xx_balloon3.c
> +++ b/drivers/pcmcia/pxa2xx_balloon3.c
> @@ -25,6 +25,8 @@
>
> ?#include <mach/balloon3.h>
>
> +#include <asm/mach-types.h>
> +
> ?#include "soc_common.h"
>
> ?/*
> @@ -127,6 +129,9 @@ static int __init balloon3_pcmcia_init(void)
> ?{
> ? ? ? ?int ret;
>
> + ? ? ? if (!machine_is_balloon3())
> + ? ? ? ? ? ? ? return -ENODEV;
> +
> ? ? ? ?balloon3_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
> ? ? ? ?if (!balloon3_pcmcia_device)
> ? ? ? ? ? ? ? ?return -ENOMEM;
> --
> 1.7.4.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-04-04 6:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-01 9:28 [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform Dmitry Eremin-Solenikov
2011-04-01 9:28 ` [PATCH 2/2] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform Dmitry Eremin-Solenikov
2011-04-04 6:46 ` Eric Miao
2011-04-04 6:47 ` [PATCH 1/2] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform 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).