diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-09-13 04:19:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:05:53 -0400 |
commit | 0b656321f338a2e5e3d9a9bdce959a2d76857967 (patch) | |
tree | 2f1581be1e243ace0cb25a255b71aa09fc4aa2ce /drivers/media/video/gspca/sq905.c | |
parent | 548264375b1c0d51b418bf7ab6d2fec647307ab7 (diff) |
V4L/DVB: gspca - all modules: Display error messages when gspca debug disabled
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sq905.c')
-rw-r--r-- | drivers/media/video/gspca/sq905.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c index 1e39afc5d088..404067745775 100644 --- a/drivers/media/video/gspca/sq905.c +++ b/drivers/media/video/gspca/sq905.c | |||
@@ -123,7 +123,7 @@ static int sq905_command(struct gspca_dev *gspca_dev, u16 index) | |||
123 | SQ905_COMMAND, index, gspca_dev->usb_buf, 1, | 123 | SQ905_COMMAND, index, gspca_dev->usb_buf, 1, |
124 | SQ905_CMD_TIMEOUT); | 124 | SQ905_CMD_TIMEOUT); |
125 | if (ret < 0) { | 125 | if (ret < 0) { |
126 | PDEBUG(D_ERR, "%s: usb_control_msg failed (%d)", | 126 | err("%s: usb_control_msg failed (%d)", |
127 | __func__, ret); | 127 | __func__, ret); |
128 | return ret; | 128 | return ret; |
129 | } | 129 | } |
@@ -135,7 +135,7 @@ static int sq905_command(struct gspca_dev *gspca_dev, u16 index) | |||
135 | SQ905_PING, 0, gspca_dev->usb_buf, 1, | 135 | SQ905_PING, 0, gspca_dev->usb_buf, 1, |
136 | SQ905_CMD_TIMEOUT); | 136 | SQ905_CMD_TIMEOUT); |
137 | if (ret < 0) { | 137 | if (ret < 0) { |
138 | PDEBUG(D_ERR, "%s: usb_control_msg failed 2 (%d)", | 138 | err("%s: usb_control_msg failed 2 (%d)", |
139 | __func__, ret); | 139 | __func__, ret); |
140 | return ret; | 140 | return ret; |
141 | } | 141 | } |
@@ -158,7 +158,7 @@ static int sq905_ack_frame(struct gspca_dev *gspca_dev) | |||
158 | SQ905_READ_DONE, 0, gspca_dev->usb_buf, 1, | 158 | SQ905_READ_DONE, 0, gspca_dev->usb_buf, 1, |
159 | SQ905_CMD_TIMEOUT); | 159 | SQ905_CMD_TIMEOUT); |
160 | if (ret < 0) { | 160 | if (ret < 0) { |
161 | PDEBUG(D_ERR, "%s: usb_control_msg failed (%d)", __func__, ret); | 161 | err("%s: usb_control_msg failed (%d)", __func__, ret); |
162 | return ret; | 162 | return ret; |
163 | } | 163 | } |
164 | 164 | ||
@@ -186,7 +186,7 @@ sq905_read_data(struct gspca_dev *gspca_dev, u8 *data, int size, int need_lock) | |||
186 | if (need_lock) | 186 | if (need_lock) |
187 | mutex_unlock(&gspca_dev->usb_lock); | 187 | mutex_unlock(&gspca_dev->usb_lock); |
188 | if (ret < 0) { | 188 | if (ret < 0) { |
189 | PDEBUG(D_ERR, "%s: usb_control_msg failed (%d)", __func__, ret); | 189 | err("%s: usb_control_msg failed (%d)", __func__, ret); |
190 | return ret; | 190 | return ret; |
191 | } | 191 | } |
192 | ret = usb_bulk_msg(gspca_dev->dev, | 192 | ret = usb_bulk_msg(gspca_dev->dev, |
@@ -195,7 +195,7 @@ sq905_read_data(struct gspca_dev *gspca_dev, u8 *data, int size, int need_lock) | |||
195 | 195 | ||
196 | /* successful, it returns 0, otherwise negative */ | 196 | /* successful, it returns 0, otherwise negative */ |
197 | if (ret < 0 || act_len != size) { | 197 | if (ret < 0 || act_len != size) { |
198 | PDEBUG(D_ERR, "bulk read fail (%d) len %d/%d", | 198 | err("bulk read fail (%d) len %d/%d", |
199 | ret, act_len, size); | 199 | ret, act_len, size); |
200 | return -EIO; | 200 | return -EIO; |
201 | } | 201 | } |
@@ -226,7 +226,7 @@ static void sq905_dostream(struct work_struct *work) | |||
226 | 226 | ||
227 | buffer = kmalloc(SQ905_MAX_TRANSFER, GFP_KERNEL | GFP_DMA); | 227 | buffer = kmalloc(SQ905_MAX_TRANSFER, GFP_KERNEL | GFP_DMA); |
228 | if (!buffer) { | 228 | if (!buffer) { |
229 | PDEBUG(D_ERR, "Couldn't allocate USB buffer"); | 229 | err("Couldn't allocate USB buffer"); |
230 | goto quit_stream; | 230 | goto quit_stream; |
231 | } | 231 | } |
232 | 232 | ||