Support the use of '*' in model_num and model_rev entries
in ata_device_blacklist[].
CC: alan@xxxxxxxxxxxxxxxxxxx
Signed-off-by: David Milburn <dmilburn@xxxxxxxxxx>
---
drivers/ata/libata-core.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 60e78be..1c9c208 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3806,10 +3806,17 @@ static unsigned long ata_dev_blacklisted(const struct ata_device *dev)
ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev));
while (ad->model_num) {
- if (!strcmp(ad->model_num, model_num)) {
+ char *wc;
+ wc = strchr(ad->model_num, '*');
+ if (!strncmp(ad->model_num, model_num,
+ wc ? wc - ad->model_num :
+ strlen(ad->model_num))) {
if (ad->model_rev == NULL)
return ad->horkage;
- if (!strcmp(ad->model_rev, model_rev))
+ wc = strchr(ad->model_rev, '*');
+ if (!strncmp(ad->model_rev, model_rev,
+ wc ? wc - ad->model_rev :
+ strlen(ad->model_rev)))
return ad->horkage;
}
ad++;
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
