diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/char/mxser.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/char/mxser.c')
| -rw-r--r-- | drivers/char/mxser.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index e30575e87648..b638403e8e9c 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
| @@ -1612,8 +1612,10 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp) | |||
| 1612 | 1612 | ||
| 1613 | switch (cmd) { | 1613 | switch (cmd) { |
| 1614 | case MOXA_GET_MAJOR: | 1614 | case MOXA_GET_MAJOR: |
| 1615 | printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl %x, fix " | 1615 | if (printk_ratelimit()) |
| 1616 | "your userspace\n", current->comm, cmd); | 1616 | printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl " |
| 1617 | "%x (GET_MAJOR), fix your userspace\n", | ||
| 1618 | current->comm, cmd); | ||
| 1617 | return put_user(ttymajor, (int __user *)argp); | 1619 | return put_user(ttymajor, (int __user *)argp); |
| 1618 | 1620 | ||
| 1619 | case MOXA_CHKPORTENABLE: | 1621 | case MOXA_CHKPORTENABLE: |