diff options
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index f19cd97855e8..affcfd6fe76b 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
| @@ -773,7 +773,6 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( | |||
| 773 | 773 | ||
| 774 | cs = kzalloc(sizeof(*cs), GFP_KERNEL); | 774 | cs = kzalloc(sizeof(*cs), GFP_KERNEL); |
| 775 | if (!cs) { | 775 | if (!cs) { |
| 776 | dev_err(&spi->dev, "could not allocate memory for controller data\n"); | ||
| 777 | of_node_put(data_np); | 776 | of_node_put(data_np); |
| 778 | return ERR_PTR(-ENOMEM); | 777 | return ERR_PTR(-ENOMEM); |
| 779 | } | 778 | } |
| @@ -987,10 +986,8 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev) | |||
| 987 | u32 temp; | 986 | u32 temp; |
| 988 | 987 | ||
| 989 | sci = devm_kzalloc(dev, sizeof(*sci), GFP_KERNEL); | 988 | sci = devm_kzalloc(dev, sizeof(*sci), GFP_KERNEL); |
| 990 | if (!sci) { | 989 | if (!sci) |
| 991 | dev_err(dev, "memory allocation for spi_info failed\n"); | ||
| 992 | return ERR_PTR(-ENOMEM); | 990 | return ERR_PTR(-ENOMEM); |
| 993 | } | ||
| 994 | 991 | ||
| 995 | if (of_property_read_u32(dev->of_node, "samsung,spi-src-clk", &temp)) { | 992 | if (of_property_read_u32(dev->of_node, "samsung,spi-src-clk", &temp)) { |
| 996 | dev_warn(dev, "spi bus clock parent not specified, using clock at index 0 as parent\n"); | 993 | dev_warn(dev, "spi bus clock parent not specified, using clock at index 0 as parent\n"); |
