diff options
Diffstat (limited to 'drivers/media/usb/gspca/spca500.c')
| -rw-r--r-- | drivers/media/usb/gspca/spca500.c | 36 | 
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/usb/gspca/spca500.c b/drivers/media/usb/gspca/spca500.c index 25cb68d0556..9f8bf51fd64 100644 --- a/drivers/media/usb/gspca/spca500.c +++ b/drivers/media/usb/gspca/spca500.c @@ -489,7 +489,7 @@ static int spca500_full_reset(struct gspca_dev *gspca_dev)  		return err;  	err = reg_r_wait(gspca_dev, 0x06, 0, 0);  	if (err < 0) { -		PDEBUG(D_ERR, "reg_r_wait() failed"); +		PERR("reg_r_wait() failed");  		return err;  	}  	/* all ok */ @@ -505,7 +505,7 @@ static int spca500_full_reset(struct gspca_dev *gspca_dev)  static int spca500_synch310(struct gspca_dev *gspca_dev)  {  	if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0) < 0) { -		PDEBUG(D_ERR, "Set packet size: set interface error"); +		PERR("Set packet size: set interface error");  		goto error;  	}  	spca500_ping310(gspca_dev); @@ -519,7 +519,7 @@ static int spca500_synch310(struct gspca_dev *gspca_dev)  	if (usb_set_interface(gspca_dev->dev,  				gspca_dev->iface,  				gspca_dev->alt) < 0) { -		PDEBUG(D_ERR, "Set packet size: set interface error"); +		PERR("Set packet size: set interface error");  		goto error;  	}  	return 0; @@ -544,7 +544,7 @@ static void spca500_reinit(struct gspca_dev *gspca_dev)  	err = spca50x_setup_qtable(gspca_dev, 0x00, 0x8800, 0x8840,  				 qtable_pocketdv);  	if (err < 0) -		PDEBUG(D_ERR|D_STREAM, "spca50x_setup_qtable failed on init"); +		PERR("spca50x_setup_qtable failed on init");  	/* set qtable index */  	reg_w(gspca_dev, 0x00, 0x8880, 2); @@ -639,7 +639,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  					   0x00, 0x8800, 0x8840,  					   qtable_creative_pccam);  		if (err < 0) -			PDEBUG(D_ERR, "spca50x_setup_qtable failed"); +			PERR("spca50x_setup_qtable failed");  		/* Init SDRAM - needed for SDRAM access */  		reg_w(gspca_dev, 0x00, 0x870a, 0x04); @@ -647,7 +647,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  		reg_w(gspca_dev, 0x00, 0x8000, 0x0004);  		msleep(500);  		if (reg_r_wait(gspca_dev, 0, 0x8000, 0x44) != 0) -			PDEBUG(D_ERR, "reg_r_wait() failed"); +			PERR("reg_r_wait() failed");  		reg_r(gspca_dev, 0x816b, 1);  		Data = gspca_dev->usb_buf[0]; @@ -660,13 +660,13 @@ static int sd_start(struct gspca_dev *gspca_dev)  		/* enable drop packet */  		err = reg_w(gspca_dev, 0x00, 0x850a, 0x0001);  		if (err < 0) -			PDEBUG(D_ERR, "failed to enable drop packet"); +			PERR("failed to enable drop packet");  		reg_w(gspca_dev, 0x00, 0x8880, 3);  		err = spca50x_setup_qtable(gspca_dev,  					   0x00, 0x8800, 0x8840,  					   qtable_creative_pccam);  		if (err < 0) -			PDEBUG(D_ERR, "spca50x_setup_qtable failed"); +			PERR("spca50x_setup_qtable failed");  		/* Init SDRAM - needed for SDRAM access */  		reg_w(gspca_dev, 0x00, 0x870a, 0x04); @@ -675,7 +675,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  		reg_w(gspca_dev, 0x00, 0x8000, 0x0004);  		if (reg_r_wait(gspca_dev, 0, 0x8000, 0x44) != 0) -			PDEBUG(D_ERR, "reg_r_wait() failed"); +			PERR("reg_r_wait() failed");  		reg_r(gspca_dev, 0x816b, 1);  		Data = gspca_dev->usb_buf[0]; @@ -689,18 +689,18 @@ static int sd_start(struct gspca_dev *gspca_dev)  		/* do a full reset */  		err = spca500_full_reset(gspca_dev);  		if (err < 0) -			PDEBUG(D_ERR, "spca500_full_reset failed"); +			PERR("spca500_full_reset failed");  		/* enable drop packet */  		err = reg_w(gspca_dev, 0x00, 0x850a, 0x0001);  		if (err < 0) -			PDEBUG(D_ERR, "failed to enable drop packet"); +			PERR("failed to enable drop packet");  		reg_w(gspca_dev, 0x00, 0x8880, 3);  		err = spca50x_setup_qtable(gspca_dev,  					   0x00, 0x8800, 0x8840,  					   qtable_creative_pccam);  		if (err < 0) -			PDEBUG(D_ERR, "spca50x_setup_qtable failed"); +			PERR("spca50x_setup_qtable failed");  		spca500_setmode(gspca_dev, xmult, ymult);  		reg_w(gspca_dev, 0x20, 0x0001, 0x0004); @@ -709,7 +709,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  		reg_w(gspca_dev, 0x00, 0x8000, 0x0004);  		if (reg_r_wait(gspca_dev, 0, 0x8000, 0x44) != 0) -			PDEBUG(D_ERR, "reg_r_wait() failed"); +			PERR("reg_r_wait() failed");  		reg_r(gspca_dev, 0x816b, 1);  		Data = gspca_dev->usb_buf[0]; @@ -722,7 +722,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  		/* do a full reset */  		err = spca500_full_reset(gspca_dev);  		if (err < 0) -			PDEBUG(D_ERR, "spca500_full_reset failed"); +			PERR("spca500_full_reset failed");  		/* enable drop packet */  		reg_w(gspca_dev, 0x00, 0x850a, 0x0001);  		reg_w(gspca_dev, 0x00, 0x8880, 0); @@ -730,7 +730,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  					   0x00, 0x8800, 0x8840,  					   qtable_kodak_ez200);  		if (err < 0) -			PDEBUG(D_ERR, "spca50x_setup_qtable failed"); +			PERR("spca50x_setup_qtable failed");  		spca500_setmode(gspca_dev, xmult, ymult);  		reg_w(gspca_dev, 0x20, 0x0001, 0x0004); @@ -739,7 +739,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  		reg_w(gspca_dev, 0x00, 0x8000, 0x0004);  		if (reg_r_wait(gspca_dev, 0, 0x8000, 0x44) != 0) -			PDEBUG(D_ERR, "reg_r_wait() failed"); +			PERR("reg_r_wait() failed");  		reg_r(gspca_dev, 0x816b, 1);  		Data = gspca_dev->usb_buf[0]; @@ -765,7 +765,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  		err = spca50x_setup_qtable(gspca_dev,  				   0x00, 0x8800, 0x8840, qtable_pocketdv);  		if (err < 0) -			PDEBUG(D_ERR, "spca50x_setup_qtable failed"); +			PERR("spca50x_setup_qtable failed");  		reg_w(gspca_dev, 0x00, 0x8880, 2);  		/* familycam Quicksmart pocketDV stuff */ @@ -795,7 +795,7 @@ static int sd_start(struct gspca_dev *gspca_dev)  					0x00, 0x8800,  					0x8840, qtable_creative_pccam);  		if (err < 0) -			PDEBUG(D_ERR, "spca50x_setup_qtable failed"); +			PERR("spca50x_setup_qtable failed");  		reg_w(gspca_dev, 0x00, 0x8880, 3);  		reg_w(gspca_dev, 0x00, 0x800a, 0x00);  		/* Init SDRAM - needed for SDRAM access */  |