From 61dca8dcf064368ccf19175c79649a18b024e971 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 21 Sep 2012 14:32:04 +0800 Subject: [PATCH] --- yaml --- r: 333337 b: refs/heads/master c: a87e662827bca4b10a320e62da3fb21826eab987 h: refs/heads/master i: 333335: 779d0eda968e552e3b81d41d3a94c493a7b98394 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/omap_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d294eb518551..b42d05a57bf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 104c7949e20e84dedddb66c1fc4b599931382d21 +refs/heads/master: a87e662827bca4b10a320e62da3fb21826eab987 diff --git a/trunk/arch/arm/plat-omap/omap_device.c b/trunk/arch/arm/plat-omap/omap_device.c index c490240bb82c..3f62de67fa4a 100644 --- a/trunk/arch/arm/plat-omap/omap_device.c +++ b/trunk/arch/arm/plat-omap/omap_device.c @@ -671,7 +671,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p dev_set_name(&pdev->dev, "%s", pdev->name); od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt); - if (!od) + if (IS_ERR(od)) goto odbs_exit1; ret = platform_device_add_data(pdev, pdata, pdata_len);