Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 377327
b: refs/heads/master
c: cc0ee98
h: refs/heads/master
i:
  377325: d4d4f7b
  377323: 452dbfa
  377319: 715b4dc
  377311: 9411f6b
v: v3
  • Loading branch information
Mika Westerberg authored and Mark Brown committed Jun 21, 2013
1 parent 1c9c11a commit 5a7d1f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 5548f98c46538d1da04eff179a52e50537d11465
refs/heads/master: cc0ee9873c6afafb387379ca1df25da78a08c603
2 changes: 1 addition & 1 deletion trunk/drivers/spi/spi-pxa2xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev))
return NULL;

pdata = devm_kzalloc(&pdev->dev, sizeof(*ssp), GFP_KERNEL);
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) {
dev_err(&pdev->dev,
"failed to allocate memory for platform data\n");
Expand Down

0 comments on commit 5a7d1f7

Please sign in to comment.