diff options
| author | Erwan Bracq <erwan.bracq@stericsson.com> | 2011-04-23 12:32:31 +0200 |
|---|---|---|
| committer | Henrik Aberg <henrik.aberg@stericsson.com> | 2011-05-18 09:40:11 +0200 |
| commit | ff3323613eca7eff85a59b3cb69732d4a3e93903 (patch) | |
| tree | 1c51c0eaebba4eaf46aa25e7a1e9251d13f77abe | |
| parent | ad62f66bd1fcc4542bbc421776a020be4723450a (diff) | |
CAIF: Minor alignment with internal CAIF git
Some added blank line and BUGON for CAIF serial.
Change-Id: If3452ed104b93203fc86fe6a95fd957946447876
Signed-off-by: Erwan Bracq <erwan.bracq@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21527
Reviewed-by: QATEST
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | drivers/net/caif/Makefile | 4 | ||||
| -rw-r--r-- | drivers/net/caif/caif_serial.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile index aeaedf8192b..c19c3c65c4c 100644 --- a/drivers/net/caif/Makefile +++ b/drivers/net/caif/Makefile @@ -1,6 +1,4 @@ -ifeq ($(CONFIG_CAIF_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif +ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG # Serial interface obj-$(CONFIG_CAIF_TTY) += caif_serial.o diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index 3df0c0f8b8b..318821b14fe 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c @@ -182,6 +182,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data, * This is not yet handled. */ + BUG_ON(ser->dev == NULL); /* * Workaround for garbage at start of transmission, |