diff options
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index a07b75814442..901d0e0ba3eb 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
@@ -886,11 +886,8 @@ static int setup(struct spi_device *spi) | |||
886 | chip = spi_get_ctldata(spi); | 886 | chip = spi_get_ctldata(spi); |
887 | if (!chip) { | 887 | if (!chip) { |
888 | chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); | 888 | chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); |
889 | if (!chip) { | 889 | if (!chip) |
890 | dev_err(&spi->dev, | ||
891 | "failed setup: can't allocate chip data\n"); | ||
892 | return -ENOMEM; | 890 | return -ENOMEM; |
893 | } | ||
894 | 891 | ||
895 | if (drv_data->ssp_type == CE4100_SSP) { | 892 | if (drv_data->ssp_type == CE4100_SSP) { |
896 | if (spi->chip_select > 4) { | 893 | if (spi->chip_select > 4) { |
@@ -1037,11 +1034,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) | |||
1037 | return NULL; | 1034 | return NULL; |
1038 | 1035 | ||
1039 | pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); | 1036 | pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); |
1040 | if (!pdata) { | 1037 | if (!pdata) |
1041 | dev_err(&pdev->dev, | ||
1042 | "failed to allocate memory for platform data\n"); | ||
1043 | return NULL; | 1038 | return NULL; |
1044 | } | ||
1045 | 1039 | ||
1046 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1040 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1047 | if (!res) | 1041 | if (!res) |