From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 29 May 2014 17:03:47 +0000 (-0400)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... 
X-Git-Tag: v3.16~18^2~11^2~7^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5eb1aeb25df89c627248a162cc35ffb556dc486;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth-next

Conflicts:
	drivers/bluetooth/btusb.c
---

a5eb1aeb25df89c627248a162cc35ffb556dc486
diff --cc drivers/bluetooth/btusb.c
index a7dfbf9,8f579cd..a1c80b0
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -1486,8 -1635,13 +1636,11 @@@ static int btusb_probe(struct usb_inter
  	if (id->driver_info & BTUSB_BCM92035)
  		hdev->setup = btusb_setup_bcm92035;
  
+ 	if (id->driver_info & BTUSB_BCM_PATCHRAM)
+ 		hdev->setup = btusb_setup_bcm_patchram;
+ 
 -	if (id->driver_info & BTUSB_INTEL) {
 -		usb_enable_autosuspend(data->udev);
 +	if (id->driver_info & BTUSB_INTEL)
  		hdev->setup = btusb_setup_intel;
 -	}
  
  	/* Interface numbers are hardcoded in the specification */
  	data->isoc = usb_ifnum_to_if(data->udev, 1);