This way it's with the other sdio quirk-related patches. Signed-off-by: Solomon Peachy <pizza@xxxxxxxxxxxx> --- .../26-sdio-quirks/drivers_net_wireless_cw1200_sdio.patch | 15 +++++++++++++++ .../network/75-cw1200-sdio-quirk/cw1200.patch | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_cw1200_sdio.patch delete mode 100644 patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch diff --git a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_cw1200_sdio.patch b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_cw1200_sdio.patch new file mode 100644 index 0000000..2533051 --- /dev/null +++ b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_cw1200_sdio.patch @@ -0,0 +1,15 @@ +--- a/drivers/net/wireless/cw1200/cw1200_sdio.c ++++ b/drivers/net/wireless/cw1200/cw1200_sdio.c +@@ -253,6 +253,12 @@ static size_t cw1200_sdio_align_size(struct hwbus_priv *self, size_t size) + else + size = sdio_align_size(self->func, size); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) ++ /* A quirk to handle this was committed in 3.2-rc */ ++ if (size == SDIO_BLOCK_SIZE) ++ size += SDIO_BLOCK_SIZE; /* HW bug; force use of block mode */ ++#endif ++ + return size; + } + diff --git a/patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch b/patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch deleted file mode 100644 index 2533051..0000000 --- a/patches/collateral-evolutions/network/75-cw1200-sdio-quirk/cw1200.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/net/wireless/cw1200/cw1200_sdio.c -+++ b/drivers/net/wireless/cw1200/cw1200_sdio.c -@@ -253,6 +253,12 @@ static size_t cw1200_sdio_align_size(struct hwbus_priv *self, size_t size) - else - size = sdio_align_size(self->func, size); - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) -+ /* A quirk to handle this was committed in 3.2-rc */ -+ if (size == SDIO_BLOCK_SIZE) -+ size += SDIO_BLOCK_SIZE; /* HW bug; force use of block mode */ -+#endif -+ - return size; - } - -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
