Merge pull request #580 from wigyori/cc-libpcap
[15.05/openwrt.git] / target / linux / bcm53xx / patches-3.18 / 082-02-USB-bcma-replace-numbers-with-constants.patch
1 From 98e13e05a1bab82c3bec1d867159bc8384acbe5b Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Thu, 11 Jun 2015 22:57:36 +0200
4 Subject: [PATCH] USB: bcma: replace numbers with constants
5
6 The constants for these numbers were added long time ago, use them.
7
8 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
9 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
10 ---
11  drivers/usb/host/bcma-hcd.c | 3 ++-
12  1 file changed, 2 insertions(+), 1 deletion(-)
13
14 --- a/drivers/usb/host/bcma-hcd.c
15 +++ b/drivers/usb/host/bcma-hcd.c
16 @@ -233,7 +233,8 @@ static int bcma_hcd_probe(struct bcma_de
17  
18         /* In AI chips EHCI is addrspace 0, OHCI is 1 */
19         ohci_addr = dev->addr_s[0];
20 -       if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749)
21 +       if ((chipinfo->id == BCMA_CHIP_ID_BCM5357 ||
22 +            chipinfo->id == BCMA_CHIP_ID_BCM4749)
23             && chipinfo->rev == 0)
24                 ohci_addr = 0x18009000;
25