diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-21 07:28:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 07:28:24 -0400 |
| commit | 470fba7ebe60ad9185056b080b331abad24b4df9 (patch) | |
| tree | f83bc13d97adaf5dd0e0f1d6a157b890f868577f /lib/iomap.c | |
| parent | 7225e75144b9718cbbe1820d9c011c809d5773fd (diff) | |
| parent | 6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff) | |
Merge branch 'linus' into x86/doc
Diffstat (limited to 'lib/iomap.c')
| -rw-r--r-- | lib/iomap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/iomap.c b/lib/iomap.c index 37a3ea4cac9f..d32229385151 100644 --- a/lib/iomap.c +++ b/lib/iomap.c | |||
| @@ -40,8 +40,7 @@ static void bad_io_access(unsigned long port, const char *access) | |||
| 40 | static int count = 10; | 40 | static int count = 10; |
| 41 | if (count) { | 41 | if (count) { |
| 42 | count--; | 42 | count--; |
| 43 | printk(KERN_ERR "Bad IO access at port %#lx (%s)\n", port, access); | 43 | WARN(1, KERN_ERR "Bad IO access at port %#lx (%s)\n", port, access); |
| 44 | WARN_ON(1); | ||
| 45 | } | 44 | } |
| 46 | } | 45 | } |
| 47 | 46 | ||