A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-next

Browse source 
Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
This commit is contained in:
Jiri Kosina 2013-01-29 10:48:30 +01:00
commit 617677295b
11382 changed files with 530741 additions and 302619 deletions
Download patch file Download diff file Expand all files Collapse all files

18
net/caif/caif_usb.c
View file

@ -126,20 +126,16 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
struct net_device *dev = arg;
struct caif_dev_common common;
struct cflayer *layer, *link_support;
struct usbnet *usbnet = netdev_priv(dev);
struct usb_device *usbdev = usbnet->udev;
struct ethtool_drvinfo drvinfo;
struct usbnet *usbnet;
struct usb_device *usbdev;
/*
* Quirks: High-jack ethtool to find if we have a NCM device,
* and find it's VID/PID.
*/
if (dev->ethtool_ops == NULL || dev->ethtool_ops->get_drvinfo == NULL)
/* Check whether we have a NCM device, and find its VID/PID. */
if (!(dev->dev.parent && dev->dev.parent->driver &&
strcmp(dev->dev.parent->driver->name, "cdc_ncm") == 0))
return 0;
dev->ethtool_ops->get_drvinfo(dev, &drvinfo);
if (strncmp(drvinfo.driver, "cdc_ncm", 7) != 0)
return 0;
usbnet = netdev_priv(dev);
usbdev = usbnet->udev;
pr_debug("USB CDC NCM device VID:0x%4x PID:0x%4x\n",
le16_to_cpu(usbdev->descriptor.idVendor),

3
net/caif/cfctrl.c
View file

@ -515,8 +515,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)
client_layer : NULL);
}
if (req != NULL)
kfree(req);
kfree(req);
spin_unlock_bh(&cfctrl->info_list_lock);
}