Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271737
b: refs/heads/master
c: be61251
h: refs/heads/master
i:
  271735: c45e130
v: v3
  • Loading branch information
Joe Perches authored and Mauro Carvalho Chehab committed Sep 4, 2011
1 parent 1ad319d commit 086706a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70a429954799bbf71f87abf12aaa35bf52cd9913
refs/heads/master: be612514c0f9d543d3689111755e1aa6a008e88f
14 changes: 8 additions & 6 deletions trunk/drivers/media/video/gspca/pac207.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define MODULE_NAME "pac207"

#include <linux/input.h>
Expand Down Expand Up @@ -178,8 +180,8 @@ static int pac207_write_regs(struct gspca_dev *gspca_dev, u16 index,
0x00, index,
gspca_dev->usb_buf, length, PAC207_CTRL_TIMEOUT);
if (err < 0)
err("Failed to write registers to index 0x%04X, error %d)",
index, err);
pr_err("Failed to write registers to index 0x%04X, error %d\n",
index, err);

return err;
}
Expand All @@ -194,8 +196,8 @@ static int pac207_write_reg(struct gspca_dev *gspca_dev, u16 index, u16 value)
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
value, index, NULL, 0, PAC207_CTRL_TIMEOUT);
if (err)
err("Failed to write a register (index 0x%04X,"
" value 0x%02X, error %d)", index, value, err);
pr_err("Failed to write a register (index 0x%04X, value 0x%02X, error %d)\n",
index, value, err);

return err;
}
Expand All @@ -210,8 +212,8 @@ static int pac207_read_reg(struct gspca_dev *gspca_dev, u16 index)
0x00, index,
gspca_dev->usb_buf, 1, PAC207_CTRL_TIMEOUT);
if (res < 0) {
err("Failed to read a register (index 0x%04X, error %d)",
index, res);
pr_err("Failed to read a register (index 0x%04X, error %d)\n",
index, res);
return res;
}

Expand Down

0 comments on commit 086706a

Please sign in to comment.