diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-09 12:42:57 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-09 12:42:57 -0600 |
| commit | e4c8308c852e6b3fa49215052a5b9e99597dee99 (patch) | |
| tree | a44ef3377c17d69c2210e809ac2552540ce6f1fc /drivers/misc | |
| parent | c37f3c2749b53225d36faa5c583203c5f12ae15b (diff) | |
| parent | 626a96db11698119a67eeda130488e869aa6f14e (diff) | |
| download | linux-e4c8308c852e6b3fa49215052a5b9e99597dee99.tar.gz | |
Merge branch 'ep93xx-dma' into spi/next
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/ti-st/st_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index 1a05fe08e2cb..f91f82eabda7 100644 --- a/drivers/misc/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c @@ -747,8 +747,8 @@ static void st_tty_close(struct tty_struct *tty) pr_debug("%s: done ", __func__); } -static unsigned int st_tty_receive(struct tty_struct *tty, - const unsigned char *data, char *tty_flags, int count) +static void st_tty_receive(struct tty_struct *tty, const unsigned char *data, + char *tty_flags, int count) { #ifdef VERBOSE print_hex_dump(KERN_DEBUG, ">in>", DUMP_PREFIX_NONE, @@ -761,8 +761,6 @@ static unsigned int st_tty_receive(struct tty_struct *tty, */ st_recv(tty->disc_data, data, count); pr_debug("done %s", __func__); - - return count; } /* wake-up function called in from the TTY layer |