patch-2.4.10 linux/drivers/usb/serial/empeg.c
Next file: linux/drivers/usb/serial/ftdi_sio.c
Previous file: linux/drivers/usb/serial/digi_acceleport.c
Back to the patch index
Back to the overall index
- Lines: 47
- Date:
Fri Sep 14 14:04:07 2001
- Orig file:
v2.4.9/linux/drivers/usb/serial/empeg.c
- Orig date:
Sun Aug 12 13:28:00 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/usb/serial/empeg.c linux/drivers/usb/serial/empeg.c
@@ -85,8 +85,6 @@
#define EMPEG_VENDOR_ID 0x084f
#define EMPEG_PRODUCT_ID 0x0001
-#define MIN(a,b) (((a)<(b))?(a):(b))
-
/* function prototypes for an empeg-car player */
static int empeg_open (struct usb_serial_port *port, struct file *filp);
static void empeg_close (struct usb_serial_port *port, struct file *filp);
@@ -278,10 +276,13 @@
}
}
- transfer_size = MIN (count, URB_TRANSFER_BUFFER_SIZE);
+ transfer_size = min (count, URB_TRANSFER_BUFFER_SIZE);
if (from_user) {
- copy_from_user (urb->transfer_buffer, current_position, transfer_size);
+ if (copy_from_user (urb->transfer_buffer, current_position, transfer_size)) {
+ bytes_sent = -EFAULT;
+ break;
+ }
} else {
memcpy (urb->transfer_buffer, current_position, transfer_size);
}
@@ -301,8 +302,11 @@
/* send it down the pipe */
status = usb_submit_urb(urb);
- if (status)
- dbg(__FUNCTION__ " - usb_submit_urb(write bulk) failed with status = %d", status);
+ if (status) {
+ err(__FUNCTION__ " - usb_submit_urb(write bulk) failed with status = %d", status);
+ bytes_sent = status;
+ break;
+ }
current_position += transfer_size;
bytes_sent += transfer_size;
@@ -661,6 +665,7 @@
MODULE_AUTHOR( DRIVER_AUTHOR );
MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_LICENSE("GPL");
MODULE_PARM(debug, "i");
MODULE_PARM_DESC(debug, "Debug enabled or not");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)