From: Geert Uytterhoeven <geert@linux-m68k.org>
To: linux-m68k@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org
Subject: [PATCH 08/11] input/amijoy: Add missing platform check
Date: Wed, 21 Mar 2012 10:51:52 +0100 [thread overview]
Message-ID: <1332323515-7314-8-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1332323515-7314-1-git-send-email-geert@linux-m68k.org>
On multi-platform kernels, the Amiga joystick driver may be initialized
when running on Amiga only. Else it may crash later.
Fortunately this driver is almost always compiled as a module (to avoid
conflicts with the mouse driver), so it needs an explicit insmod to
trigger a crash.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
---
drivers/input/joystick/amijoy.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index 0bc8620..3aa93bf 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -108,6 +108,9 @@ static int __init amijoy_init(void)
int i, j;
int err;
+ if (!MACH_IS_AMIGA)
+ return -ENODEV;
+
for (i = 0; i < 2; i++) {
if (!amijoy[i])
continue;
--
1.7.0.4
next prev parent reply other threads:[~2012-03-21 9:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 9:51 [PATCH 01/11] m68k: Remove unused MAX_NOINT_IPL definition Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 02/11] m68k/amiga: Mark z_dev_present() __init Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 03/11] m68k/amiga: Add error checks when registering platform devices Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 04/11] m68k/amiga: Use arch_initcall() for " Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 05/11] m68k/atari: Add missing platform check before " Geert Uytterhoeven
2012-03-25 3:46 ` Michael Schmitz
2012-03-25 8:01 ` Geert Uytterhoeven
2012-03-25 18:53 ` Michael Schmitz
2012-03-21 9:51 ` [PATCH 06/11] m68k/atari: Change VME irq numbers from unsigned long to unsigned int Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 07/11] m68k/mac: Add missing platform check before registering platform devices Geert Uytterhoeven
2012-03-21 9:51 ` Geert Uytterhoeven [this message]
2012-03-26 6:29 ` [PATCH 08/11] input/amijoy: Add missing platform check Dmitry Torokhov
2012-03-21 9:51 ` [PATCH 09/11] net/ariadne: Improve debug prints Geert Uytterhoeven
2012-03-22 2:16 ` David Miller
2012-03-21 9:51 ` [PATCH 10/11] scsi/atari: Revive "atascsi=" setup option Geert Uytterhoeven
2012-03-21 9:51 ` [PATCH 11/11] scsi/atari: Make more functions static Geert Uytterhoeven
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=1332323515-7314-8-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.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).