X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fps3.c;h=c62a10d20dffc4f5f8eee107ac42ffa04c549d0a;hp=abe269200a988cb68099b476556c7f11933f69f3;hb=5cceb42c773aa404456417685ea50b2ada5570a2;hpb=e74391b7d8ec47b41315e7c2ce6b4b0a9ad139fe;ds=sidebyside

diff --git a/ui/common/ps3.c b/ui/common/ps3.c
index abe2692..c62a10d 100644
--- a/ui/common/ps3.c
+++ b/ui/common/ps3.c
@@ -87,7 +87,7 @@ static int ps3_flash_open(struct ps3_flash_ctx *fc, const char *mode)
 	result = os_area_fixed_read(&fc->header, &fc->params, fc->dev);
 
 	if (result) {
-		pb_log("%s: os_area_fixed_read failed: %s\n", __func__);
+		pb_log("%s: os_area_fixed_read failed\n", __func__);
 		goto fail;
 	}
 
@@ -111,16 +111,10 @@ int ps3_flash_get_values(struct ps3_flash_values *values)
 	struct ps3_flash_ctx fc;
 	uint64_t tmp;
 
-	/* Set default values. */
-
-	values->default_item = 0;
-	values->timeout = ps3_timeout_forever;
-	values->video_mode = 1;
-
 	result = ps3_flash_open(&fc, "r");
 
 	if (result)
-		goto done;
+		goto fail;
 
 	result = os_area_db_read(&fc.db, &fc.header, fc.dev);
 
@@ -129,7 +123,7 @@ int ps3_flash_get_values(struct ps3_flash_values *values)
 	if (result) {
 		pb_log("%s: os_area_db_read failed: %s\n", __func__,
 			strerror(errno));
-		goto done;
+		goto fail;
 	}
 
 	sum = result = os_area_db_get(&fc.db, &id_default_item, &tmp);
@@ -147,14 +141,13 @@ int ps3_flash_get_values(struct ps3_flash_values *values)
 	if (!result)
 		values->video_mode = (uint16_t)tmp;
 
-done:
 	pb_log("%s: default_item: %x\n", __func__,
 		(unsigned int)values->default_item);
 	pb_log("%s: timeout: %u\n", __func__,
 		(unsigned int)values->timeout);
 	pb_log("%s: video_mode:   %u\n", __func__,
 		(unsigned int)values->video_mode);
-
+fail:
 	return (result || sum) ? -1 : 0;
 }