From 31ed0490bc03a22e3227352b7152e9206c2f8aea Mon Sep 17 00:00:00 2001 From: merge Date: Fri, 28 Nov 2008 09:06:55 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-hist-patch-rfkill-fix-init-values-a pending-tracking-hist top was MERGE-via-stable-tracking-hist-patch-rfkill-fix-init-values-a / bbb0210fab54015099b24bec396670708a9be1e2 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-patch-rfkill-fix-init-values-a stable-tracking-hist top was patch-rfkill-fix-init-values-a / 3fdcf5fbcdd609825e3eb760af5cd76940693da2 ... parent commitmessage: From: Sean McNeil PATCH-rfkill-fix-init-values-and-cleanup-compilation-warning.eml This applies cleanly to stable-tracking to fix errors on initialization. Sean --- arch/arm/plat-s3c24xx/neo1973_pm_bt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c index d70ee3d0956..df901a6c437 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c @@ -253,8 +253,8 @@ static int __init gta01_bt_probe(struct platform_device *pdev) rfkill = rfkill_allocate(&pdev->dev, RFKILL_TYPE_BLUETOOTH); rfkill->name = pdev->name; - rfkill->data = pdev; - rfkill->state = -1; + rfkill->data = &pdev->dev; + rfkill->state = RFKILL_STATE_OFF; rfkill->toggle_radio = bt_rfkill_toggle_radio; ret = rfkill_register(rfkill); -- cgit v1.2.3