diff options
author | Praneeth Bajjuri | 2014-09-08 17:36:54 -0500 |
---|---|---|
committer | Praneeth Bajjuri | 2014-09-08 17:36:54 -0500 |
commit | 2b277982952080f73cbccde8f098a9a8cb737c25 (patch) | |
tree | 278afb35b44db568b4da4089cb711e63b65f6754 | |
parent | 418a28938a2c9840a0d196d71d3b40cd45c45a74 (diff) | |
parent | 1c6e87f1fb521478832c280ebc46cf483c10ff43 (diff) | |
download | kernel-audio-2b277982952080f73cbccde8f098a9a8cb737c25.tar.gz kernel-audio-2b277982952080f73cbccde8f098a9a8cb737c25.tar.xz kernel-audio-2b277982952080f73cbccde8f098a9a8cb737c25.zip |
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
* p-ti-linux-3.8.y:
DESERLINK: Fix up for printing wrong error message.
SERLINK: Fix up for printing wrong error message.
Change-Id: Ic92cd482278291ade1ae0d55d3fc8d4468302284
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r-- | drivers/video/omap2/displays/lvds-de-serlink.c | 11 | ||||
-rw-r--r-- | drivers/video/omap2/displays/lvds-serlink.c | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/drivers/video/omap2/displays/lvds-de-serlink.c b/drivers/video/omap2/displays/lvds-de-serlink.c index 3ffe0c71db22..2a71fcaafa93 100644 --- a/drivers/video/omap2/displays/lvds-de-serlink.c +++ b/drivers/video/omap2/displays/lvds-de-serlink.c | |||
@@ -434,11 +434,14 @@ static int dserlink_probe(struct i2c_client *client, | |||
434 | 434 | ||
435 | /* Register sysfs hooks */ | 435 | /* Register sysfs hooks */ |
436 | status = sysfs_create_group(&client->dev.kobj, &dserlink_attr_group); | 436 | status = sysfs_create_group(&client->dev.kobj, &dserlink_attr_group); |
437 | if (status) | 437 | if (status) { |
438 | goto fail; | 438 | dev_err(&client->dev, "probe error %d for '%s'\n", |
439 | |||
440 | dev_err(&client->dev, "probe error %d for '%s'\n", | ||
441 | status, client->name); | 439 | status, client->name); |
440 | goto fail; | ||
441 | } | ||
442 | else | ||
443 | dev_err(&client->dev, "probe successful for '%s'\n", | ||
444 | client->name); | ||
442 | 445 | ||
443 | return status; | 446 | return status; |
444 | fail: | 447 | fail: |
diff --git a/drivers/video/omap2/displays/lvds-serlink.c b/drivers/video/omap2/displays/lvds-serlink.c index 5b99248e02d0..2d0a691a0947 100644 --- a/drivers/video/omap2/displays/lvds-serlink.c +++ b/drivers/video/omap2/displays/lvds-serlink.c | |||
@@ -444,11 +444,14 @@ static int serlink_probe(struct i2c_client *client, | |||
444 | 444 | ||
445 | /* Register sysfs hooks */ | 445 | /* Register sysfs hooks */ |
446 | status = sysfs_create_group(&client->dev.kobj, &serlink_attr_group); | 446 | status = sysfs_create_group(&client->dev.kobj, &serlink_attr_group); |
447 | if (status) | 447 | if (status) { |
448 | goto fail; | 448 | dev_err(&client->dev, "probe error %d for '%s'\n", |
449 | |||
450 | dev_err(&client->dev, "probe error %d for '%s'\n", | ||
451 | status, client->name); | 449 | status, client->name); |
450 | goto fail; | ||
451 | } | ||
452 | else | ||
453 | dev_err(&client->dev, "probe successful for '%s'\n", | ||
454 | client->name); | ||
452 | 455 | ||
453 | return status; | 456 | return status; |
454 | fail: | 457 | fail: |