projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fvp' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
net
/
caif
/
caif_usb.c
diff --git
a/net/caif/caif_usb.c
b/net/caif/caif_usb.c
index ef8ebaa993cf3ca9c915f8d2a230a3d04af79c34..942e00a425fd9b015118cb7a0982209c1989003b 100644
(file)
--- a/
net/caif/caif_usb.c
+++ b/
net/caif/caif_usb.c
@@
-1,7
+1,7
@@
/*
* CAIF USB handler
* Copyright (C) ST-Ericsson AB 2011
/*
* CAIF USB handler
* Copyright (C) ST-Ericsson AB 2011
- * Author: Sjur Brendeland
/sjur.brandeland@stericsson.com
+ * Author: Sjur Brendeland
* License terms: GNU General Public License (GPL) version 2
*
*/
* License terms: GNU General Public License (GPL) version 2
*
*/
@@
-75,7
+75,7
@@
static int cfusbl_transmit(struct cflayer *layr, struct cfpkt *pkt)
}
static void cfusbl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
}
static void cfusbl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
-
int phyid)
+ int phyid)
{
if (layr->up && layr->up->ctrlcmd)
layr->up->ctrlcmd(layr->up, ctrl, layr->id);
{
if (layr->up && layr->up->ctrlcmd)
layr->up->ctrlcmd(layr->up, ctrl, layr->id);
@@
-121,7
+121,7
@@
static struct packet_type caif_usb_type __read_mostly = {
};
static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
};
static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
- void *arg)
+
void *arg)
{
struct net_device *dev = arg;
struct caif_dev_common common;
{
struct net_device *dev = arg;
struct caif_dev_common common;