projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}
[deliverable/linux.git]
/
drivers
/
isdn
/
gigaset
/
usb-gigaset.c
diff --git
a/drivers/isdn/gigaset/usb-gigaset.c
b/drivers/isdn/gigaset/usb-gigaset.c
index 04f2ad7ba8b04590ae927591096d95e0fc783a1b..c8e1c357cec88870e4984233a93af30bb3bac70e 100644
(file)
--- a/
drivers/isdn/gigaset/usb-gigaset.c
+++ b/
drivers/isdn/gigaset/usb-gigaset.c
@@
-50,7
+50,7
@@
MODULE_PARM_DESC(cidmode, "Call-ID mode");
#define USB_M105_PRODUCT_ID 0x0009
/* table of devices that work with this driver */
#define USB_M105_PRODUCT_ID 0x0009
/* table of devices that work with this driver */
-static struct usb_device_id gigaset_table [] = {
+static
const
struct usb_device_id gigaset_table [] = {
{ USB_DEVICE(USB_M105_VENDOR_ID, USB_M105_PRODUCT_ID) },
{ } /* Terminating entry */
};
{ USB_DEVICE(USB_M105_VENDOR_ID, USB_M105_PRODUCT_ID) },
{ } /* Terminating entry */
};
@@
-652,7
+652,7
@@
static int write_modem(struct cardstate *cs)
* transmit data
*/
count = min(bcs->tx_skb->len, (unsigned) ucs->bulk_out_size);
* transmit data
*/
count = min(bcs->tx_skb->len, (unsigned) ucs->bulk_out_size);
-
memcpy(ucs->bulk_out_buffer, bcs->tx_skb->data
, count);
+
skb_copy_from_linear_data(bcs->tx_skb, ucs->bulk_out_buffer
, count);
skb_pull(bcs->tx_skb, count);
atomic_set(&ucs->busy, 1);
gig_dbg(DEBUG_OUTPUT, "write_modem: send %d bytes", count);
skb_pull(bcs->tx_skb, count);
atomic_set(&ucs->busy, 1);
gig_dbg(DEBUG_OUTPUT, "write_modem: send %d bytes", count);
@@
-860,7
+860,7
@@
static void gigaset_disconnect(struct usb_interface *interface)
gigaset_unassign(cs);
}
gigaset_unassign(cs);
}
-static struct gigaset_ops ops = {
+static
const
struct gigaset_ops ops = {
gigaset_write_cmd,
gigaset_write_room,
gigaset_chars_in_buffer,
gigaset_write_cmd,
gigaset_write_room,
gigaset_chars_in_buffer,
This page took
0.025085 seconds
and
5
git commands to generate.