From d88947dc2fd4693fb4aa8ef38694d5125f711082 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 5 Nov 2007 21:42:25 +0100 Subject: [PATCH] --- yaml --- r: 73169 b: refs/heads/master c: 699b052ad2996c4ca87aa4b9d4a51dcca0f9e588 h: refs/heads/master i: 73167: d85954a8a2cba72eaedb1958684aab6ba822d8c3 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-probe.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d7cf493a28d..feda39a1df33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afda5e4da5abf7366ba8ac49e7634b3c85a143ae +refs/heads/master: 699b052ad2996c4ca87aa4b9d4a51dcca0f9e588 diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index 6a6f2e066b46..56fb0b843429 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -172,11 +172,12 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd) ide_fixstring(id->fw_rev, sizeof(id->fw_rev), bswap); ide_fixstring(id->serial_no, sizeof(id->serial_no), bswap); + /* we depend on this a lot! */ + id->model[sizeof(id->model)-1] = '\0'; + if (strstr(id->model, "E X A B Y T E N E S T")) goto err_misc; - /* we depend on this a lot! */ - id->model[sizeof(id->model)-1] = '\0'; printk("%s: %s, ", drive->name, id->model); drive->present = 1; drive->dead = 0;