vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert usb-quiesce since it's wrong.

Browse source 
* grub-core/disk/ieee1275/ofdisk.c (quiesce): Removed.
	(grub_ofdisk_init): Don't do quiesce.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-13 22:44:45 +02:00
parent 61f1d93b09
commit 4abde34671
2 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-06-13 Vladimir Serbinenko <phcoder@gmail.com>
Revert usb-quiesce since it's wrong.
* grub-core/disk/ieee1275/ofdisk.c (quiesce): Removed.
(grub_ofdisk_init): Don't do quiesce.
2012-06-13 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Apply

31
grub-core/disk/ieee1275/ofdisk.c
View file

@ -476,34 +476,6 @@ grub_ofdisk_init (void)
grub_disk_dev_register (&grub_ofdisk_dev);
}
static int quiesce (struct grub_ieee1275_devalias *alias)
{
static grub_ieee1275_ihandle_t ihandle;
struct set_color_args
{
struct grub_ieee1275_common_hdr common;
grub_ieee1275_cell_t method;
grub_ieee1275_cell_t ihandle;
grub_ieee1275_cell_t catch_result;
}
args;
if (grub_strcmp (alias->type, "usb") != 0)
return 0;
if (grub_ieee1275_open (alias->path, &ihandle))
return 0;
INIT_IEEE1275_COMMON (&args.common, "call-method", 2, 1);
args.method = (grub_ieee1275_cell_t) "usb-quiesce";
args.ihandle = ihandle;
IEEE1275_CALL_ENTRY_FN (&args);
grub_ieee1275_close (ihandle);
return 0;
}
void
grub_ofdisk_fini (void)
{
@ -512,8 +484,5 @@ grub_ofdisk_fini (void)
last_ihandle = 0;
last_devpath = NULL;
grub_ieee1275_devices_iterate (quiesce);
grub_millisleep (10);
grub_disk_dev_unregister (&grub_ofdisk_dev);
}