projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into upstream-jgarzik
[powerpc.git]
/
drivers
/
usb
/
serial
/
garmin_gps.c
diff --git
a/drivers/usb/serial/garmin_gps.c
b/drivers/usb/serial/garmin_gps.c
index
4b1196a
..
74660a3
100644
(file)
--- a/
drivers/usb/serial/garmin_gps.c
+++ b/
drivers/usb/serial/garmin_gps.c
@@
-1031,7
+1031,7
@@
static void garmin_close (struct usb_serial_port *port, struct file * filp)
}
}
-static void garmin_write_bulk_callback (struct urb *urb
, struct pt_regs *regs
)
+static void garmin_write_bulk_callback (struct urb *urb)
{
unsigned long flags;
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
{
unsigned long flags;
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
@@
-1274,7
+1274,7
@@
static void garmin_read_process(struct garmin_data * garmin_data_p,
}
}
-static void garmin_read_bulk_callback (struct urb *urb
, struct pt_regs *regs
)
+static void garmin_read_bulk_callback (struct urb *urb)
{
unsigned long flags;
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
{
unsigned long flags;
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
@@
-1330,7
+1330,7
@@
static void garmin_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
}
}
-static void garmin_read_int_callback (struct urb *urb
, struct pt_regs *regs
)
+static void garmin_read_int_callback (struct urb *urb)
{
unsigned long flags;
int status;
{
unsigned long flags;
int status;
@@
-1523,12
+1523,11
@@
static int garmin_attach (struct usb_serial *serial)
dbg("%s", __FUNCTION__);
dbg("%s", __FUNCTION__);
- garmin_data_p = k
malloc
(sizeof(struct garmin_data), GFP_KERNEL);
+ garmin_data_p = k
zalloc
(sizeof(struct garmin_data), GFP_KERNEL);
if (garmin_data_p == NULL) {
dev_err(&port->dev, "%s - Out of memory\n", __FUNCTION__);
return -ENOMEM;
}
if (garmin_data_p == NULL) {
dev_err(&port->dev, "%s - Out of memory\n", __FUNCTION__);
return -ENOMEM;
}
- memset (garmin_data_p, 0, sizeof(struct garmin_data));
init_timer(&garmin_data_p->timer);
spin_lock_init(&garmin_data_p->lock);
INIT_LIST_HEAD(&garmin_data_p->pktlist);
init_timer(&garmin_data_p->timer);
spin_lock_init(&garmin_data_p->lock);
INIT_LIST_HEAD(&garmin_data_p->pktlist);
@@
-1567,6
+1566,7
@@
static struct usb_serial_driver garmin_device = {
.name = "garmin_gps",
},
.description = "Garmin GPS usb/tty",
.name = "garmin_gps",
},
.description = "Garmin GPS usb/tty",
+ .usb_driver = &garmin_driver,
.id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,