From: Vladimir 'phcoder' Serbinenko Date: Sun, 28 Apr 2013 11:54:32 +0000 (+0200) Subject: * grub-core/commands/probe.c: Add missing grub_device_close. X-Git-Tag: grub-2.02-beta1~1088 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=eadfad244ea69272c2418e966ae08d270afd9a7b;p=thirdparty%2Fgrub.git * grub-core/commands/probe.c: Add missing grub_device_close. --- diff --git a/ChangeLog b/ChangeLog index 21260c0a3..5c50b56e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-28 Vladimir Serbinenko + + * grub-core/commands/probe.c: Add missing grub_device_close. + 2013-04-28 Vladimir Serbinenko * INSTALL: Document linguas.sh. diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c index eeece876d..cf2793e1d 100644 --- a/grub-core/commands/probe.c +++ b/grub-core/commands/probe.c @@ -83,6 +83,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args) grub_env_set (state[0].arg, val); else grub_printf ("%s", val); + grub_device_close (dev); return GRUB_ERR_NONE; } if (state[2].set) @@ -94,6 +95,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args) grub_env_set (state[0].arg, val); else grub_printf ("%s", val); + grub_device_close (dev); return GRUB_ERR_NONE; } fs = grub_fs_probe (dev); @@ -105,6 +107,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args) grub_env_set (state[0].arg, fs->name); else grub_printf ("%s", fs->name); + grub_device_close (dev); return GRUB_ERR_NONE; } if (state[4].set) @@ -125,6 +128,7 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args) else grub_printf ("%s", uuid); grub_free (uuid); + grub_device_close (dev); return GRUB_ERR_NONE; } if (state[5].set) @@ -147,8 +151,10 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args) else grub_printf ("%s", label); grub_free (label); + grub_device_close (dev); return GRUB_ERR_NONE; } + grub_device_close (dev); return grub_error (GRUB_ERR_BAD_ARGUMENT, "unrecognised target"); }