kernel: update 3.18 to 3.18.16
[openwrt/svn-archive/archive.git] / target / linux / bcm53xx / patches-3.18 / 180-USB-bcma-remove-chip-id-check.patch
1 From baf3d128e5bdf9d322539609133a15b493b0c2ef Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Thu, 11 Jun 2015 22:57:35 +0200
4 Subject: [PATCH] USB: bcma: remove chip id check
5
6 I have never seen any bcma device with an USB host core which was not a
7 SoC, the bcma devices have an USB device core with a different core id.
8 Some SoC have IDs with 47XX and 53XX in decimal form which would be
9 rejected by this check. Instead of fixing this check just remove it.
10
11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
12 ---
13 drivers/usb/host/bcma-hcd.c | 5 -----
14 1 file changed, 5 deletions(-)
15
16 --- a/drivers/usb/host/bcma-hcd.c
17 +++ b/drivers/usb/host/bcma-hcd.c
18 @@ -214,16 +214,11 @@ err_alloc:
19 static int bcma_hcd_probe(struct bcma_device *dev)
20 {
21 int err;
22 - u16 chipid_top;
23 u32 ohci_addr;
24 struct bcma_hcd_device *usb_dev;
25 struct bcma_chipinfo *chipinfo;
26
27 chipinfo = &dev->bus->chipinfo;
28 - /* USBcores are only connected on embedded devices. */
29 - chipid_top = (chipinfo->id & 0xFF00);
30 - if (chipid_top != 0x4700 && chipid_top != 0x5300)
31 - return -ENODEV;
32
33 /* TODO: Probably need checks here; is the core connected? */
34