V4L/DVB: gspca - all modules: Display error messages when gspca debug disabled

[pandora-kernel.git] / drivers / media / video / gspca / xirlink_cit.c

diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c
index 36aa44f..8715577 100644 (file)
--- a/drivers/media/video/gspca/xirlink_cit.c
+++ b/drivers/media/video/gspca/xirlink_cit.c
@@ -798,7 +798,7 @@ static int cit_write_reg(struct gspca_dev *gspca_dev, u16 value, u16 index)
                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT,
                        value, index, NULL, 0, 1000);
        if (err < 0)
-               PDEBUG(D_ERR, "Failed to write a register (index 0x%04X,"
+               err("Failed to write a register (index 0x%04X,"
                        " value 0x%02X, error %d)", index, value, err);
 
        return 0;
@@ -814,8 +814,7 @@ static int cit_read_reg(struct gspca_dev *gspca_dev, u16 index)
                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT,
                        0x00, index, buf, 8, 1000);
        if (res < 0) {
-               PDEBUG(D_ERR,
-                       "Failed to read a register (index 0x%04X, error %d)",
+               err("Failed to read a register (index 0x%04X, error %d)",
                        index, res);
                return res;
        }
@@ -1586,7 +1585,7 @@ static int cit_get_packet_size(struct gspca_dev *gspca_dev)
        intf = usb_ifnum_to_if(gspca_dev->dev, gspca_dev->iface);
        alt = usb_altnum_to_altsetting(intf, gspca_dev->alt);
        if (!alt) {
-               PDEBUG(D_ERR, "Couldn't get altsetting");
+               err("Couldn't get altsetting");
                return -EIO;
        }
 
@@ -2784,7 +2783,7 @@ static int sd_isoc_nego(struct gspca_dev *gspca_dev)
 
        ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, 1);
        if (ret < 0)
-               PDEBUG(D_ERR|D_STREAM, "set alt 1 err %d", ret);
+               err("set alt 1 err %d", ret);
 
        return ret;
 }