aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164/saa7164-buffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-buffer.c')
-rw-r--r--drivers/media/video/saa7164/saa7164-buffer.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c
index ddd25211c9e8..66696fa8341d 100644
--- a/drivers/media/video/saa7164/saa7164-buffer.c
+++ b/drivers/media/video/saa7164/saa7164-buffer.c
@@ -93,7 +93,7 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
93 u32 len) 93 u32 len)
94{ 94{
95 struct tmHWStreamParameters *params = &port->hw_streamingparams; 95 struct tmHWStreamParameters *params = &port->hw_streamingparams;
96 struct saa7164_buffer *buf = 0; 96 struct saa7164_buffer *buf = NULL;
97 struct saa7164_dev *dev = port->dev; 97 struct saa7164_dev *dev = port->dev;
98 int i; 98 int i;
99 99
@@ -103,7 +103,7 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
103 } 103 }
104 104
105 buf = kzalloc(sizeof(struct saa7164_buffer), GFP_KERNEL); 105 buf = kzalloc(sizeof(struct saa7164_buffer), GFP_KERNEL);
106 if (buf == NULL) { 106 if (!buf) {
107 log_warn("%s() SAA_ERR_NO_RESOURCES\n", __func__); 107 log_warn("%s() SAA_ERR_NO_RESOURCES\n", __func__);
108 goto ret; 108 goto ret;
109 } 109 }
@@ -157,7 +157,7 @@ fail2:
157fail1: 157fail1:
158 kfree(buf); 158 kfree(buf);
159 159
160 buf = 0; 160 buf = NULL;
161ret: 161ret:
162 return buf; 162 return buf;
163} 163}
@@ -289,14 +289,14 @@ struct saa7164_user_buffer *saa7164_buffer_alloc_user(struct saa7164_dev *dev,
289 struct saa7164_user_buffer *buf; 289 struct saa7164_user_buffer *buf;
290 290
291 buf = kzalloc(sizeof(struct saa7164_user_buffer), GFP_KERNEL); 291 buf = kzalloc(sizeof(struct saa7164_user_buffer), GFP_KERNEL);
292 if (buf == 0) 292 if (!buf)
293 return 0; 293 return NULL;
294 294
295 buf->data = kzalloc(len, GFP_KERNEL); 295 buf->data = kzalloc(len, GFP_KERNEL);
296 296
297 if (buf->data == 0) { 297 if (!buf->data) {
298 kfree(buf); 298 kfree(buf);
299 return 0; 299 return NULL;
300 } 300 }
301 301
302 buf->actual_size = len; 302 buf->actual_size = len;
@@ -315,7 +315,7 @@ void saa7164_buffer_dealloc_user(struct saa7164_user_buffer *buf)
315 return; 315 return;
316 316
317 kfree(buf->data); 317 kfree(buf->data);
318 buf->data = 0; 318 buf->data = NULL;
319 319
320 kfree(buf); 320 kfree(buf);
321} 321}