Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 243407
b: refs/heads/master
c: cf5e23e
h: refs/heads/master
i:
  243405: 522785f
  243403: cb37572
  243399: 8414b01
  243391: f50f473
v: v3
  • Loading branch information
Sergei Shtylyov authored and Chris Ball committed Mar 25, 2011
1 parent d283d69 commit d1901be
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5a8fba524c2063cb297bdbacda535448ee365dc4
refs/heads/master: cf5e23e1c27af4291cf90020c295756ba4dcf326
6 changes: 2 additions & 4 deletions trunk/drivers/mmc/host/sdhci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1016,16 +1016,14 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
struct sdhci_pci_chip *chip;
struct sdhci_pci_slot *slot;

u8 slots, rev, first_bar;
u8 slots, first_bar;
int ret, i;

BUG_ON(pdev == NULL);
BUG_ON(ent == NULL);

pci_read_config_byte(pdev, PCI_CLASS_REVISION, &rev);

dev_info(&pdev->dev, "SDHCI controller found [%04x:%04x] (rev %x)\n",
(int)pdev->vendor, (int)pdev->device, (int)rev);
(int)pdev->vendor, (int)pdev->device, (int)pdev->revision);

ret = pci_read_config_byte(pdev, PCI_SLOT_INFO, &slots);
if (ret)
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/mmc/host/via-sdmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1087,14 +1087,13 @@ static int __devinit via_sd_probe(struct pci_dev *pcidev,
struct mmc_host *mmc;
struct via_crdr_mmc_host *sdhost;
u32 base, len;
u8 rev, gatt;
u8 gatt;
int ret;

pci_read_config_byte(pcidev, PCI_CLASS_REVISION, &rev);
pr_info(DRV_NAME
": VIA SDMMC controller found at %s [%04x:%04x] (rev %x)\n",
pci_name(pcidev), (int)pcidev->vendor, (int)pcidev->device,
(int)rev);
(int)pcidev->revision);

ret = pci_enable_device(pcidev);
if (ret)
Expand Down

0 comments on commit d1901be

Please sign in to comment.