aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164/saa7164-api.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-api.c')
-rw-r--r--drivers/media/video/saa7164/saa7164-api.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c
index bd86d970f4c2..8a98ab68239e 100644
--- a/drivers/media/video/saa7164/saa7164-api.c
+++ b/drivers/media/video/saa7164/saa7164-api.c
@@ -743,7 +743,7 @@ int saa7164_api_configure_dif(struct saa7164_port *port, u32 std)
743int saa7164_api_initialize_dif(struct saa7164_port *port) 743int saa7164_api_initialize_dif(struct saa7164_port *port)
744{ 744{
745 struct saa7164_dev *dev = port->dev; 745 struct saa7164_dev *dev = port->dev;
746 struct saa7164_port *p = 0; 746 struct saa7164_port *p = NULL;
747 int ret = -EINVAL; 747 int ret = -EINVAL;
748 u32 std = 0; 748 u32 std = 0;
749 749
@@ -926,9 +926,9 @@ int saa7164_api_configure_port_mpeg2ps(struct saa7164_dev *dev,
926 926
927int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len) 927int saa7164_api_dump_subdevs(struct saa7164_dev *dev, u8 *buf, int len)
928{ 928{
929 struct saa7164_port *tsport = 0; 929 struct saa7164_port *tsport = NULL;
930 struct saa7164_port *encport = 0; 930 struct saa7164_port *encport = NULL;
931 struct saa7164_port *vbiport = 0; 931 struct saa7164_port *vbiport = NULL;
932 u32 idx, next_offset; 932 u32 idx, next_offset;
933 int i; 933 int i;
934 struct tmComResDescrHeader *hdr, *t; 934 struct tmComResDescrHeader *hdr, *t;
@@ -1340,7 +1340,7 @@ int saa7164_api_enum_subdevs(struct saa7164_dev *dev)
1340 1340
1341 /* Allocate enough storage for all of the descs */ 1341 /* Allocate enough storage for all of the descs */
1342 buf = kzalloc(buflen, GFP_KERNEL); 1342 buf = kzalloc(buflen, GFP_KERNEL);
1343 if (buf == NULL) 1343 if (!buf)
1344 return SAA_ERR_NO_RESOURCES; 1344 return SAA_ERR_NO_RESOURCES;
1345 1345
1346 /* Retrieve them */ 1346 /* Retrieve them */