From: dbaryshkov@gmail.com (Dmitry Eremin-Solenikov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/6] pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform
Date: Wed, 5 Jan 2011 05:05:08 +0300 [thread overview]
Message-ID: <1294193110-23958-4-git-send-email-dbaryshkov@gmail.com> (raw)
In-Reply-To: <1294193110-23958-1-git-send-email-dbaryshkov@gmail.com>
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 dbbdd00..0b1caca 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"
/*
@@ -128,6 +130,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.2.3
next prev parent reply other threads:[~2011-01-05 2:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 2:05 [PATCH 1/6] i2c-pxa: move i2c_pxa_remove to __devexit instead of just __exit Dmitry Eremin-Solenikov
2011-01-05 2:05 ` [PATCH 2/6] mfp-pxa27x: correct naming of GPIO13_KP_DKIN_7 Dmitry Eremin-Solenikov
2011-01-05 2:05 ` [PATCH 3/6] pxa2xx: update stored gpio settings in pxa2xx_mfp_set_lpm() Dmitry Eremin-Solenikov
2011-01-05 2:05 ` Dmitry Eremin-Solenikov [this message]
2011-01-05 2:05 ` [PATCH 5/6] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform Dmitry Eremin-Solenikov
2011-01-05 2:05 ` [PATCH 6/6] Fix eseries compilation if w100fb is not compiled in kernel Dmitry Eremin-Solenikov
2011-01-05 8:27 ` Uwe Kleine-König
2011-01-05 10:54 ` Uwe Kleine-König
2011-01-05 11:17 ` Dmitry Eremin-Solenikov
2011-01-05 8:24 ` [PATCH 1/6] i2c-pxa: move i2c_pxa_remove to __devexit instead of just __exit Uwe Kleine-König
2011-01-05 9:19 ` Ben Dooks
2011-01-06 11:01 ` [PATCH] i2c-pxa: fix unbidding/rebidding of the device Dmitry Eremin-Solenikov
2011-01-06 12:40 ` Uwe Kleine-König
2011-01-08 16:06 ` [PATCH] i2c-pxa: fix unbinding/rebinding " Dmitry Eremin-Solenikov
2011-01-08 16:18 ` Uwe Kleine-König
2011-02-15 13:59 ` Dmitry Eremin-Solenikov
2011-02-15 16:23 ` Uwe Kleine-König
2011-01-05 12:17 ` [PATCH 1/6] i2c-pxa: move i2c_pxa_remove to __devexit instead of just __exit Ben Dooks
2011-01-08 17:42 ` Ben Dooks
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=1294193110-23958-4-git-send-email-dbaryshkov@gmail.com \
--to=dbaryshkov@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).