From 9d4b083105230a9950bbc0cf8f918a1915892f78 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 25 Mar 2011 10:05:58 -0700 Subject: [PATCH] --- yaml --- r: 254388 b: refs/heads/master c: 52ae18ac80fbdd268720b0daa27ac797a801500c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/probe_roms.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8ae382600538..98dee5c873df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eefd2518aa04e1c69118252dc23e3444e694bc1 +refs/heads/master: 52ae18ac80fbdd268720b0daa27ac797a801500c diff --git a/trunk/drivers/scsi/isci/probe_roms.c b/trunk/drivers/scsi/isci/probe_roms.c index 1697487f908c..2df8d8e5d5ea 100644 --- a/trunk/drivers/scsi/isci/probe_roms.c +++ b/trunk/drivers/scsi/isci/probe_roms.c @@ -250,9 +250,8 @@ struct isci_orom *isci_get_efi_var(struct pci_dev *pdev) return NULL; } - copy_len = min(evar->DataSize, - min(oem_hdr->len - sizeof(*oem_hdr), - sizeof(*rom))); + copy_len = min_t(u16, evar->DataSize, + min_t(u16, oem_hdr->len - sizeof(*oem_hdr), sizeof(*rom))); memcpy(rom, (char *)evar->Data + sizeof(*oem_hdr), copy_len);