From 352a186bc05c9aec52017501a37723bf99436278 Mon Sep 17 00:00:00 2001 From: Pavan Savoy Date: Fri, 10 Sep 2010 15:58:55 -0400 Subject: [PATCH] --- yaml --- r: 219880 b: refs/heads/master c: dfb7ef7d84fa45270b0138dbe6ab4316b03cc724 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ti-st/st_kim.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15788683061e..68c383d62d3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48c51a8cf484c8d569f97050bbac493c5bc79c2f +refs/heads/master: dfb7ef7d84fa45270b0138dbe6ab4316b03cc724 diff --git a/trunk/drivers/staging/ti-st/st_kim.c b/trunk/drivers/staging/ti-st/st_kim.c index 9e99463f76e8..be18c7a17446 100644 --- a/trunk/drivers/staging/ti-st/st_kim.c +++ b/trunk/drivers/staging/ti-st/st_kim.c @@ -638,7 +638,14 @@ static int kim_probe(struct platform_device *pdev) long *gpios = pdev->dev.platform_data; struct kim_data_s *kim_gdata; - st_kim_devices[pdev->id] = pdev; + if ((pdev->id != -1) && (pdev->id < MAX_ST_DEVICES)) { + /* multiple devices could exist */ + st_kim_devices[pdev->id] = pdev; + } else { + /* platform's sure about existance of 1 device */ + st_kim_devices[0] = pdev; + } + kim_gdata = kzalloc(sizeof(struct kim_data_s), GFP_ATOMIC); if (!kim_gdata) { pr_err("no mem to allocate");