aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/t613.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index d1d733b9359b..90f0877eb599 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -26,6 +26,8 @@
26 * Costantino Leandro 26 * Costantino Leandro
27 */ 27 */
28 28
29#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
30
29#define MODULE_NAME "t613" 31#define MODULE_NAME "t613"
30 32
31#include <linux/slab.h> 33#include <linux/slab.h>
@@ -572,7 +574,7 @@ static void reg_w_buf(struct gspca_dev *gspca_dev,
572 574
573 tmpbuf = kmemdup(buffer, len, GFP_KERNEL); 575 tmpbuf = kmemdup(buffer, len, GFP_KERNEL);
574 if (!tmpbuf) { 576 if (!tmpbuf) {
575 err("Out of memory"); 577 pr_err("Out of memory\n");
576 return; 578 return;
577 } 579 }
578 usb_control_msg(gspca_dev->dev, 580 usb_control_msg(gspca_dev->dev,
@@ -598,7 +600,7 @@ static void reg_w_ixbuf(struct gspca_dev *gspca_dev,
598 } else { 600 } else {
599 p = tmpbuf = kmalloc(len * 2, GFP_KERNEL); 601 p = tmpbuf = kmalloc(len * 2, GFP_KERNEL);
600 if (!tmpbuf) { 602 if (!tmpbuf) {
601 err("Out of memory"); 603 pr_err("Out of memory\n");
602 return; 604 return;
603 } 605 }
604 } 606 }
@@ -652,7 +654,7 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev)
652 } 654 }
653 byte = reg_r(gspca_dev, 0x0063); 655 byte = reg_r(gspca_dev, 0x0063);
654 if (byte != 0x17) { 656 if (byte != 0x17) {
655 err("Bad sensor reset %02x", byte); 657 pr_err("Bad sensor reset %02x\n", byte);
656 /* continue? */ 658 /* continue? */
657 } 659 }
658 660
@@ -890,7 +892,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
890 sd->sensor = SENSOR_OM6802; 892 sd->sensor = SENSOR_OM6802;
891 break; 893 break;
892 default: 894 default:
893 err("unknown sensor %04x", sensor_id); 895 pr_err("unknown sensor %04x\n", sensor_id);
894 return -EINVAL; 896 return -EINVAL;
895 } 897 }
896 898
@@ -905,7 +907,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
905 break; /* OK */ 907 break; /* OK */
906 } 908 }
907 if (i < 0) { 909 if (i < 0) {
908 err("Bad sensor reset %02x", test_byte); 910 pr_err("Bad sensor reset %02x\n", test_byte);
909 return -EIO; 911 return -EIO;
910 } 912 }
911 reg_w_buf(gspca_dev, n2, sizeof n2); 913 reg_w_buf(gspca_dev, n2, sizeof n2);