2
0
Fork 0

solo5: patch misleading indentation

This commit is contained in:
Emery Hemingway 2020-11-21 18:16:06 +01:00
parent 4b2ffc218b
commit 40f86fadb1
2 changed files with 21 additions and 1 deletions

View File

@ -18,7 +18,12 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
patches = [ ./genode.patch ./elftool.patch ./test_time.patch ];
patches = [
./genode.patch
./elftool.patch
./test_time.patch
./misleading-indentation.patch
];
configurePhase = with stdenv; ''
runHook preConfigure

View File

@ -0,0 +1,15 @@
diff --git a/bindings/genode/bindings.cc b/bindings/genode/bindings.cc
index a4a4a34..1019a39 100644
--- a/bindings/genode/bindings.cc
+++ b/bindings/genode/bindings.cc
@@ -475,8 +475,8 @@ struct Solo5::Platform
net_acquire(const char *name, solo5_handle_t &handle, solo5_net_info &info)
{
unsigned index = ~0;
- struct mft_entry *me = mft_get_by_name(&mft, name, MFT_DEV_NET_BASIC, &index); {
- if (me != nullptr && index < MFT_MAX_ENTRIES)
+ mft_entry *me = mft_get_by_name(&mft, name, MFT_DEV_NET_BASIC, &index);
+ if (me != nullptr && index < MFT_MAX_ENTRIES) {
handle = index;
return devices[index]->net_info(info);
}