aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsandman <sandman@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-07-29 20:28:38 +0000
committersandman <sandman@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-07-29 20:28:38 +0000
commitb140860dd5b2ac79a9c7e663fab295096f6f3948 (patch)
tree234c700395db9e5cc68157090072b0a276df1495
parentc3cb38770287346433d03bfbcc7edf2f3efa9961 (diff)
downloadbusybox-w32-b140860dd5b2ac79a9c7e663fab295096f6f3948.tar.gz
busybox-w32-b140860dd5b2ac79a9c7e663fab295096f6f3948.tar.bz2
busybox-w32-b140860dd5b2ac79a9c7e663fab295096f6f3948.zip
Fixed a bug that I had introduced with the new "options" handling.
git-svn-id: svn://busybox.net/trunk/busybox@5115 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--modutils/modprobe.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 36d2aa211..1f4aebbd7 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -349,16 +349,17 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
349 struct dep_t *adt; 349 struct dep_t *adt;
350 350
351 for ( adt = depend; adt; adt = adt-> m_next ) { 351 for ( adt = depend; adt; adt = adt-> m_next ) {
352 if ( strcmp ( adt-> m_module, dt-> m_deparr [0] ) == 0 ) { 352 if ( strcmp ( adt-> m_module, dt-> m_deparr [0] ) == 0 )
353 if ( !opt )
354 opt = adt-> m_options;
355 break; 353 break;
356 }
357 } 354 }
358 if ( !adt ) 355 if ( adt ) {
359 return; 356 dt = adt;
357 mod = dt-> m_module;
358 if ( !opt )
359 opt = dt-> m_options;
360 }
360 else 361 else
361 dt = adt; 362 return;
362 } 363 }
363 else 364 else
364 return; 365 return;