From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Wed, 03 Jun 2009 14:51:33 +0000
Subject: [PATCH] rules: avoid reading DRIVER for devices without modalias
Message-Id: <4A268DF5.2030108@tuffmail.co.uk>
List-Id: <linux-hotplug.vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: linux-hotplug@vger.kernel.org

DRIVER requires a readlink() in sysfs.  The MODALIAS key is provided by
uevent and requires no additional read.  Test MODALIAS first.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

diff --git a/rules/rules.d/80-drivers.rules b/rules/rules.d/80-drivers.rules
index 7e13e80..2b68ddc 100644
--- a/rules/rules.d/80-drivers.rules
+++ b/rules/rules.d/80-drivers.rules
@@ -2,7 +2,7 @@
 
 ACTION!="add", GOTO="drivers_end"
 
-DRIVER!="?*", ENV{MODALIAS}="?*", RUN{ignore_error}+="/sbin/modprobe -b $env{MODALIAS}"
+ENV{MODALIAS}="?*", DRIVER!="?*", RUN{ignore_error}+="/sbin/modprobe -b $env{MODALIAS}"
 SUBSYSTEM="tifm", ENV{TIFM_CARD_TYPE}="SD", RUN+="/sbin/modprobe -b tifm_sd"
 SUBSYSTEM="tifm", ENV{TIFM_CARD_TYPE}="MS", RUN+="/sbin/modprobe -b tifm_ms"
 SUBSYSTEM="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"