aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/usblcd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index c82c402285a0..e095772dd8e9 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -200,10 +200,8 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, siz
200 200
201 /* create a urb, and a buffer for it, and copy the data to the urb */ 201 /* create a urb, and a buffer for it, and copy the data to the urb */
202 urb = usb_alloc_urb(0, GFP_KERNEL); 202 urb = usb_alloc_urb(0, GFP_KERNEL);
203 if (!urb) { 203 if (!urb)
204 retval = -ENOMEM; 204 return -ENOMEM;
205 goto error;
206 }
207 205
208 buf = usb_buffer_alloc(dev->udev, count, GFP_KERNEL, &urb->transfer_dma); 206 buf = usb_buffer_alloc(dev->udev, count, GFP_KERNEL, &urb->transfer_dma);
209 if (!buf) { 207 if (!buf) {
">/* xxxxxx10 4kOhm */ # define RTC_TCR_8KOHM 0x03 /* xxxxxx11 8kOhm */ #elif defined(CONFIG_ETRAX_PCF8563) /* I2C bus slave registers. */ # define RTC_I2C_READ 0xa3 # define RTC_I2C_WRITE 0xa2 /* Phillips PCF8563 registers. */ # define RTC_CONTROL1 0x00 /* Control/Status register 1. */ # define RTC_CONTROL2 0x01 /* Control/Status register 2. */ # define RTC_CLOCKOUT_FREQ 0x0d /* CLKOUT frequency. */ # define RTC_TIMER_CONTROL 0x0e /* Timer control. */ # define RTC_TIMER_CNTDOWN 0x0f /* Timer countdown. */ /* BCD encoded clock registers. */ # define RTC_SECONDS 0x02 # define RTC_MINUTES 0x03 # define RTC_HOURS 0x04 # define RTC_DAY_OF_MONTH 0x05 # define RTC_WEEKDAY 0x06 /* Not coded in BCD! */ # define RTC_MONTH 0x07 # define RTC_YEAR 0x08 # define RTC_MINUTE_ALARM 0x09 # define RTC_HOUR_ALARM 0x0a # define RTC_DAY_ALARM 0x0b # define RTC_WEEKDAY_ALARM 0x0c #endif #ifdef CONFIG_ETRAX_DS1302 extern unsigned char ds1302_readreg(int reg); extern void ds1302_writereg(int reg, unsigned char val); extern int ds1302_init(void); # define CMOS_READ(x) ds1302_readreg(x) # define CMOS_WRITE(val,reg) ds1302_writereg(reg,val) # define RTC_INIT() ds1302_init() #elif defined(CONFIG_ETRAX_PCF8563) extern unsigned char pcf8563_readreg(int reg);