diff --git a/[refs] b/[refs]
index 70d7615221ac..02af1fd23b83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 128a46a55da81e563116e99e08e295fda41a145b
+refs/heads/master: 54c63cfc153c6909a5d5dbe6072e8704b091f30e
diff --git a/trunk/sound/pci/bt87x.c b/trunk/sound/pci/bt87x.c
index aaaa2e0d45c2..c840a4c08e98 100644
--- a/trunk/sound/pci/bt87x.c
+++ b/trunk/sound/pci/bt87x.c
@@ -810,7 +810,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
 	const struct pci_device_id *supported;
 
 	supported = pci_match_device(&driver, pci);
-	if (supported)
+	if (supported && supported->driver_data > 0)
 		return supported->driver_data;
 
 	for (i = 0; i < ARRAY_SIZE(blacklist); ++i)