Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934656AbXHGNiX (ORCPT ); Tue, 7 Aug 2007 09:38:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934603AbXHGNiF (ORCPT ); Tue, 7 Aug 2007 09:38:05 -0400 Received: from 85.8.24.16.se.wasadata.net ([85.8.24.16]:51323 "EHLO smtp.drzeus.cx" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934151AbXHGNiC (ORCPT ); Tue, 7 Aug 2007 09:38:02 -0400 Date: Tue, 7 Aug 2007 15:38:00 +0200 From: Pierre Ossman To: David Vrabel Cc: linux-kernel@vger.kernel.org Subject: Re: [patch 2/4] sdio: set the functions' block size Message-ID: <20070807153800.734a6cbf@poseidon.drzeus.cx> In-Reply-To: <46B86B88.5050009@csr.com> References: <11858961933491-git-send-email-david.vrabel@csr.com> <20070804152304.65ed8f1b@poseidon.drzeus.cx> <46B6F877.7060504@csr.com> <20070806171207.59fafa18@poseidon.drzeus.cx> <46B73F18.5030109@csr.com> <20070806220145.66b97559@poseidon.drzeus.cx> <46B86ADB.90000@csr.com> <46B86B88.5050009@csr.com> X-Mailer: Claws Mail 2.10.0 (GTK+ 2.11.6; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1425 Lines: 49 On Tue, 07 Aug 2007 13:54:32 +0100 David Vrabel wrote: > > Index: mmc/drivers/mmc/core/sdio.c > =================================================================== > --- mmc.orig/drivers/mmc/core/sdio.c 2007-08-07 > 00:38:33.000000000 +0100 +++ mmc/drivers/mmc/core/sdio.c > 2007-08-07 07:17:29.000000000 +0100 @@ -53,6 +53,7 @@ > { > int ret; > struct sdio_func *func; > + unsigned block_size; > > BUG_ON(fn > SDIO_MAX_FUNCS); > > @@ -70,6 +71,15 @@ > if (ret) > goto fail; > > + /* > + * Set the function's block size to the largest supported by > + * both the function and the host. > + */ > + block_size = min(func->max_blksize, > func->card->host->max_blk_size); > + ret = sdio_set_block_size(func, block_size); > + if (ret) > + goto fail; > + > card->sdio_func[fn - 1] = func; > > return 0; This is probably better done in the sdio_enable_func(). We also need to check that the card actually supports block io. -- -- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org PulseAudio, core developer http://pulseaudio.org rdesktop, core developer http://www.rdesktop.org - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/