aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 17:13:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 20:29:18 -0400
commit8da56309f04d76a474791fd27b33ddd52062bcd6 (patch)
tree1d54c09c90511c7f9696dda388f31fdfae15f779 /drivers/char
parent7b8ee84d8926e6c6ec584548d23a12f1410b4db7 (diff)
drivers: atm, char fix integer as NULL pointer warnings
drivers/atm/nicstar.c:418:25: warning: Using plain integer as NULL pointer drivers/char/drm/r128_cce.c:820:25: warning: Using plain integer as NULL pointer drivers/char/tty_io.c:1183:10: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/drm/r128_cce.c2
-rw-r--r--drivers/char/tty_io.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index f36adbd3aaf5..c31afbde62e7 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -817,7 +817,7 @@ static struct drm_buf *r128_freelist_get(struct drm_device * dev)
817 for (i = 0; i < dma->buf_count; i++) { 817 for (i = 0; i < dma->buf_count; i++) {
818 buf = dma->buflist[i]; 818 buf = dma->buflist[i];
819 buf_priv = buf->dev_private; 819 buf_priv = buf->dev_private;
820 if (buf->file_priv == 0) 820 if (!buf->file_priv)
821 return buf; 821 return buf;
822 } 822 }
823 823
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 4d3c7018f0c3..98b65a230994 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1180,7 +1180,7 @@ struct tty_driver *tty_find_polling_driver(char *name, int *line)
1180 if (*str == ',') 1180 if (*str == ',')
1181 str++; 1181 str++;
1182 if (*str == '\0') 1182 if (*str == '\0')
1183 str = 0; 1183 str = NULL;
1184 1184
1185 if (tty_line >= 0 && tty_line <= p->num && p->poll_init && 1185 if (tty_line >= 0 && tty_line <= p->num && p->poll_init &&
1186 !p->poll_init(p, tty_line, str)) { 1186 !p->poll_init(p, tty_line, str)) {