aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/saa7134/saa7134-empress.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index e002be568c21..1314522a8130 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -402,7 +402,7 @@ static int empress_init(struct saa7134_dev *dev)
402{ 402{
403 int err; 403 int err;
404 404
405 dprintk("%s: %s\n",dev->name,__FUNCTION__); 405 dprintk("%s: %s\n",dev->name,__func__);
406 dev->empress_dev = video_device_alloc(); 406 dev->empress_dev = video_device_alloc();
407 if (NULL == dev->empress_dev) 407 if (NULL == dev->empress_dev)
408 return -ENOMEM; 408 return -ENOMEM;
@@ -440,7 +440,7 @@ static int empress_init(struct saa7134_dev *dev)
440 440
441static int empress_fini(struct saa7134_dev *dev) 441static int empress_fini(struct saa7134_dev *dev)
442{ 442{
443 dprintk("%s: %s\n",dev->name,__FUNCTION__); 443 dprintk("%s: %s\n",dev->name,__func__);
444 444
445 if (NULL == dev->empress_dev) 445 if (NULL == dev->empress_dev)
446 return 0; 446 return 0;