diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/pxamci.c | 4 | ||||
-rw-r--r-- | drivers/spi/amba-pl022.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 5e0b1529964d..b00d67319058 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -693,7 +693,7 @@ static int pxamci_probe(struct platform_device *pdev) | |||
693 | if (gpio_is_valid(gpio_ro)) { | 693 | if (gpio_is_valid(gpio_ro)) { |
694 | ret = gpio_request(gpio_ro, "mmc card read only"); | 694 | ret = gpio_request(gpio_ro, "mmc card read only"); |
695 | if (ret) { | 695 | if (ret) { |
696 | dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_power); | 696 | dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_ro); |
697 | goto err_gpio_ro; | 697 | goto err_gpio_ro; |
698 | } | 698 | } |
699 | gpio_direction_input(gpio_ro); | 699 | gpio_direction_input(gpio_ro); |
@@ -701,7 +701,7 @@ static int pxamci_probe(struct platform_device *pdev) | |||
701 | if (gpio_is_valid(gpio_cd)) { | 701 | if (gpio_is_valid(gpio_cd)) { |
702 | ret = gpio_request(gpio_cd, "mmc card detect"); | 702 | ret = gpio_request(gpio_cd, "mmc card detect"); |
703 | if (ret) { | 703 | if (ret) { |
704 | dev_err(&pdev->dev, "Failed requesting gpio_cd %d\n", gpio_power); | 704 | dev_err(&pdev->dev, "Failed requesting gpio_cd %d\n", gpio_cd); |
705 | goto err_gpio_cd; | 705 | goto err_gpio_cd; |
706 | } | 706 | } |
707 | gpio_direction_input(gpio_cd); | 707 | gpio_direction_input(gpio_cd); |
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index 958a3ffc8987..ff5bbb9c43c9 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/amba-pl022.c | |||
@@ -1826,7 +1826,7 @@ static struct amba_id pl022_ids[] = { | |||
1826 | * ST Micro derivative, this has 32bit wide | 1826 | * ST Micro derivative, this has 32bit wide |
1827 | * and 32 locations deep TX/RX FIFO | 1827 | * and 32 locations deep TX/RX FIFO |
1828 | */ | 1828 | */ |
1829 | .id = 0x00108022, | 1829 | .id = 0x01080022, |
1830 | .mask = 0xffffffff, | 1830 | .mask = 0xffffffff, |
1831 | .data = &vendor_st, | 1831 | .data = &vendor_st, |
1832 | }, | 1832 | }, |